diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-30 15:07:29 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-30 15:07:29 +0300 |
commit | 7cf8c080eda823e7e2577eeed1f96e168c37ee8f (patch) | |
tree | 25777ab1b8883dd4cff80005a2edc5e385e16714 /.gitlab-ci.yml | |
parent | 4381702a8509383c7158a4d89a0ed187532604f2 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r-- | .gitlab-ci.yml | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4b5ce1ff7b2..50441492d60 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,7 +42,8 @@ workflow: # If `$FORCE_GITLAB_CI` is set, create a pipeline. - if: '$FORCE_GITLAB_CI' variables: - RUBY_VERSION: "3.0" + <<: *ruby3-variables + PIPELINE_NAME: 'Ruby 3 forced pipeline' # As part of the process of creating RCs automatically, we update stable # branches with the changes of the most recent production deployment. The # merge requests used for this merge a branch release-tools/X into a stable @@ -55,6 +56,11 @@ workflow: variables: <<: *ruby2-variables PIPELINE_NAME: 'Ruby 2 $CI_MERGE_REQUEST_EVENT_TYPE MR pipeline' + - if: '$CI_MERGE_REQUEST_LABELS =~ /Community contribution/' + variables: + <<: *ruby3-variables + GITLAB_DEPENDENCY_PROXY_ADDRESS: "" + PIPELINE_NAME: 'Ruby 3 $CI_MERGE_REQUEST_EVENT_TYPE MR pipeline (community contribution)' # For (detached) merge request pipelines. - if: '$CI_MERGE_REQUEST_IID' variables: @@ -66,13 +72,13 @@ workflow: <<: *ruby3-variables <<: *default-branch-incident-variables CRYSTALBALL: "true" - PIPELINE_NAME: 'Scheduled $CI_COMMIT_BRANCH pipeline' + PIPELINE_NAME: 'Scheduled Ruby 3 $CI_COMMIT_BRANCH branch pipeline' # Run pipelines for ruby2 branch - if: '$CI_COMMIT_BRANCH == "ruby2" && $CI_PIPELINE_SOURCE == "schedule"' variables: <<: *ruby2-variables NOTIFY_PIPELINE_FAILURE_CHANNEL: "f_ruby3" - PIPELINE_NAME: 'Scheduled ruby 2 pipeline' + PIPELINE_NAME: 'Scheduled Ruby 2 $CI_COMMIT_BRANCH branch pipeline' # This work around https://gitlab.com/gitlab-org/gitlab/-/issues/332411 whichs prevents usage of dependency proxy # when pipeline is triggered by a project access token. - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $GITLAB_USER_LOGIN =~ /project_\d+_bot\d*/' @@ -80,15 +86,18 @@ workflow: <<: *ruby3-variables <<: *default-branch-incident-variables GITLAB_DEPENDENCY_PROXY_ADDRESS: "" + PIPELINE_NAME: 'Ruby 3 $CI_COMMIT_BRANCH branch pipeline (trigerred by a project token)' # For `$CI_DEFAULT_BRANCH` branch, create a pipeline (this includes on schedules, pushes, merges, etc.). - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' variables: <<: *ruby3-variables <<: *default-branch-incident-variables + PIPELINE_NAME: 'Ruby 3 $CI_COMMIT_BRANCH branch pipeline' # For tags, create a pipeline. - if: '$CI_COMMIT_TAG' variables: <<: *ruby2-variables + PIPELINE_NAME: 'Ruby 2 $CI_COMMIT_TAG tag pipeline' # If `$GITLAB_INTERNAL` isn't set, don't create a pipeline. - if: '$GITLAB_INTERNAL == null' when: never @@ -97,12 +106,15 @@ workflow: variables: <<: *ruby2-variables NOTIFY_PIPELINE_FAILURE_CHANNEL: "releases" + PIPELINE_NAME: 'Ruby 2 $CI_COMMIT_BRANCH branch pipeline' - if: '$CI_COMMIT_BRANCH =~ /^\d+-\d+-auto-deploy-\d+$/' variables: <<: *ruby2-variables + PIPELINE_NAME: 'Ruby 2 $CI_COMMIT_BRANCH branch pipeline' - if: '$CI_COMMIT_BRANCH =~ /^security\//' variables: <<: *ruby2-variables + PIPELINE_NAME: 'Ruby 2 $CI_COMMIT_BRANCH branch pipeline' variables: PG_VERSION: "12" |