diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-16 00:14:36 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-16 00:14:36 +0300 |
| commit | 885275c832d7c76b7290b38190a6cf31438d3898 (patch) | |
| tree | 7d5de8a98dfa50003440c7e2a6c7e1504a926d90 /.gitlab-ci.yml | |
| parent | f6b58d14904a1413a5442d13f361671e59ab3ded (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 79f99211bb1..c3087716b13 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -106,28 +106,28 @@ workflow: # For tags, create a pipeline. - if: '$CI_COMMIT_TAG' variables: - <<: *ruby2-variables - PIPELINE_NAME: 'Ruby 2 $CI_COMMIT_TAG tag pipeline' + <<: *ruby3-variables + PIPELINE_NAME: 'Ruby 3 $CI_COMMIT_TAG tag pipeline' # If `$GITLAB_INTERNAL` isn't set, don't create a pipeline. - if: '$GITLAB_INTERNAL == null' when: never # For stable, auto-deploy, and security branches, create a pipeline. - if: '$CI_COMMIT_BRANCH =~ /^[\d-]+-stable(-ee)?$/' variables: - <<: *ruby2-variables + <<: *ruby3-variables NOTIFY_PIPELINE_FAILURE_CHANNEL: "releases" - PIPELINE_NAME: 'Ruby 2 $CI_COMMIT_BRANCH branch pipeline' + PIPELINE_NAME: 'Ruby 3 $CI_COMMIT_BRANCH branch pipeline' CREATE_INCIDENT_FOR_PIPELINE_FAILURE: "true" BROKEN_BRANCH_INCIDENTS_PROJECT: "gitlab-org/release/tasks" BROKEN_BRANCH_INCIDENTS_PROJECT_TOKEN: "${BROKEN_STABLE_INCIDENTS_PROJECT_TOKEN}" - if: '$CI_COMMIT_BRANCH =~ /^\d+-\d+-auto-deploy-\d+$/' variables: - <<: *ruby2-variables - PIPELINE_NAME: 'Ruby 2 $CI_COMMIT_BRANCH branch pipeline' + <<: *ruby3-variables + PIPELINE_NAME: 'Ruby 3 $CI_COMMIT_BRANCH branch pipeline' - if: '$CI_COMMIT_BRANCH =~ /^security\//' variables: - <<: *ruby2-variables - PIPELINE_NAME: 'Ruby 2 $CI_COMMIT_BRANCH branch pipeline' + <<: *ruby3-variables + PIPELINE_NAME: 'Ruby 3 $CI_COMMIT_BRANCH branch pipeline' variables: PG_VERSION: "12" |