Commit 5b4100cc authored by Shinya Maeda's avatar Shinya Maeda

Merge branch 'update-ci-template-default-branch-1' into 'master'

Update Pages CI/CD template examples to default branch

See merge request gitlab-org/gitlab!56298
parents 2f21b551 a2854fd9
---
title: Update Pages template examples to default branch
merge_request: 56298
author:
type: other
...@@ -11,5 +11,5 @@ pages: ...@@ -11,5 +11,5 @@ pages:
artifacts: artifacts:
paths: paths:
- public - public
only: rules:
- master - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
...@@ -9,5 +9,5 @@ pages: ...@@ -9,5 +9,5 @@ pages:
artifacts: artifacts:
paths: paths:
- public - public
only: rules:
- master - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
...@@ -13,5 +13,5 @@ pages: ...@@ -13,5 +13,5 @@ pages:
artifacts: artifacts:
paths: paths:
- public - public
only: rules:
- master - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
...@@ -8,5 +8,5 @@ pages: ...@@ -8,5 +8,5 @@ pages:
artifacts: artifacts:
paths: paths:
- public - public
only: rules:
- master - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
...@@ -11,5 +11,5 @@ pages: ...@@ -11,5 +11,5 @@ pages:
artifacts: artifacts:
paths: paths:
- public - public
only: rules:
- master - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
...@@ -13,5 +13,5 @@ pages: ...@@ -13,5 +13,5 @@ pages:
paths: paths:
- node_modules - node_modules
key: project key: project
only: rules:
- master - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
...@@ -10,7 +10,8 @@ test: ...@@ -10,7 +10,8 @@ test:
script: script:
- hugo - hugo
except: except:
- master variables:
- $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
pages: pages:
script: script:
...@@ -19,4 +20,5 @@ pages: ...@@ -19,4 +20,5 @@ pages:
paths: paths:
- public - public
only: only:
- master variables:
- $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
...@@ -11,7 +11,8 @@ test: ...@@ -11,7 +11,8 @@ test:
- pip install hyde - pip install hyde
- hyde gen - hyde gen
except: except:
- master variables:
- $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
pages: pages:
stage: deploy stage: deploy
...@@ -22,4 +23,5 @@ pages: ...@@ -22,4 +23,5 @@ pages:
paths: paths:
- public - public
only: only:
- master variables:
- $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
...@@ -18,7 +18,8 @@ test: ...@@ -18,7 +18,8 @@ test:
paths: paths:
- test - test
except: except:
- master variables:
- $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
pages: pages:
stage: deploy stage: deploy
...@@ -28,4 +29,5 @@ pages: ...@@ -28,4 +29,5 @@ pages:
paths: paths:
- public - public
only: only:
- master variables:
- $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
...@@ -33,5 +33,5 @@ pages: ...@@ -33,5 +33,5 @@ pages:
artifacts: artifacts:
paths: paths:
- public - public
only: rules:
- master - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
...@@ -8,5 +8,5 @@ pages: ...@@ -8,5 +8,5 @@ pages:
artifacts: artifacts:
paths: paths:
- public - public
only: rules:
- master - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
...@@ -12,5 +12,5 @@ pages: ...@@ -12,5 +12,5 @@ pages:
artifacts: artifacts:
paths: paths:
- public - public
only: rules:
- master - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
...@@ -12,7 +12,8 @@ test: ...@@ -12,7 +12,8 @@ test:
- bundle install --path vendor - bundle install --path vendor
- bundle exec middleman build - bundle exec middleman build
except: except:
- master variables:
- $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
pages: pages:
script: script:
...@@ -23,5 +24,5 @@ pages: ...@@ -23,5 +24,5 @@ pages:
artifacts: artifacts:
paths: paths:
- public - public
only: rules:
- master - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
...@@ -8,5 +8,5 @@ pages: ...@@ -8,5 +8,5 @@ pages:
artifacts: artifacts:
paths: paths:
- public - public
only: rules:
- master - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
...@@ -11,5 +11,5 @@ pages: ...@@ -11,5 +11,5 @@ pages:
artifacts: artifacts:
paths: paths:
- public - public
only: rules:
- master - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
...@@ -25,5 +25,5 @@ pages: ...@@ -25,5 +25,5 @@ pages:
artifacts: artifacts:
paths: paths:
- public - public
only: rules:
- master - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment