diff options
| author | Takuya Noguchi <takninnovationresearch@gmail.com> | 2020-08-21 13:46:26 +0300 |
|---|---|---|
| committer | Takuya Noguchi <takninnovationresearch@gmail.com> | 2020-10-26 11:11:13 +0300 |
| commit | 3bc4eed848c61d8088653fcc4b10f3de9788f74b (patch) | |
| tree | 4a9346550f9953f9918baf1d25aa9c07792417c5 /.gitlab-ci.yml | |
| parent | 7231349fd40cf4109af8043973c4faa0982025d4 (diff) | |
Use the default branch instead of master
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1a94c1d1..9df5a840 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,7 +48,7 @@ variables: - if: '$PIPELINE_SCHEDULE_TIMING == "hourly"' when: manual allow_failure: true - - if: '$CI_COMMIT_BRANCH == "master"' + - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' when: manual allow_failure: true @@ -57,7 +57,7 @@ variables: - if: '$CI_PIPELINE_SOURCE == "schedule"' when: manual allow_failure: true - - if: '$CI_COMMIT_BRANCH == "master"' + - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' when: manual allow_failure: true @@ -73,17 +73,17 @@ variables: rules: - if: '$CI_PIPELINE_SOURCE == "schedule"' - if: '$CI_MERGE_REQUEST_ID' - - if: '$CI_COMMIT_BRANCH == "master"' + - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' - if: '$CI_COMMIT_BRANCH =~ /^\d{1,2}\.\d{1,2}$/' .rules_prod: rules: - - if: '$CI_COMMIT_BRANCH == "master"' + - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' - if: '$CI_COMMIT_BRANCH =~ /^\d{1,2}\.\d{1,2}$/' .rules_pages: rules: - - if: '$CI_COMMIT_BRANCH == "master"' + - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' .rules_dev: rules: @@ -156,7 +156,7 @@ variables: expire_in: 1d # -# Compile only on master and stable branches +# Compile only on the default and stable branches # compile_prod: extends: @@ -166,7 +166,7 @@ compile_prod: NANOC_ENV: 'production' # -# Compile on all branches except master +# Compile on all branches except the default branch # compile_dev: extends: |