diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-30 21:10:11 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-30 21:10:11 +0300 |
| commit | c51425915fb1b2c367d6d828449b5cc7772ac104 (patch) | |
| tree | e0bb2d9f3e0c9aaec6fe71a9da26f9bab5d9890c /.gitlab-ci.yml | |
| parent | f65227a163435d66e3f0b80f4c52ae59d8df39a2 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d7759cdbedc..7ef143d5525 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -64,15 +64,15 @@ workflow: # they serve no purpose and will run anyway when the changes are merged. - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^release-tools\/\d+\.\d+\.\d+-rc\d+$/ && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /^[\d-]+-stable(-ee)?$/ && $CI_PROJECT_PATH == "gitlab-org/gitlab"' when: never - # For merge requests running exclusively in Ruby 3.1 - - if: '$CI_MERGE_REQUEST_LABELS =~ /pipeline:run-in-ruby3_1/' + # For merge requests running exclusively in Ruby 3.0 + - if: '$CI_MERGE_REQUEST_LABELS =~ /pipeline:run-in-ruby3_0/' variables: - <<: *next-ruby-variables + <<: *default-ruby-variables PIPELINE_NAME: 'Ruby $RUBY_VERSION $CI_MERGE_REQUEST_EVENT_TYPE MR pipeline' NO_SOURCEMAPS: 'true' - if: '$CI_MERGE_REQUEST_LABELS =~ /Community contribution/' variables: - <<: *default-ruby-variables + <<: *next-ruby-variables GITLAB_DEPENDENCY_PROXY_ADDRESS: "" PIPELINE_NAME: 'Ruby $RUBY_VERSION $CI_MERGE_REQUEST_EVENT_TYPE MR pipeline (community contribution)' NO_SOURCEMAPS: 'true' @@ -83,7 +83,7 @@ workflow: # For (detached) merge request pipelines. - if: '$CI_MERGE_REQUEST_IID' variables: - <<: *default-ruby-variables + <<: *next-ruby-variables <<: *default-merge-request-slow-tests-variables PIPELINE_NAME: 'Ruby $RUBY_VERSION $CI_MERGE_REQUEST_EVENT_TYPE MR pipeline' NO_SOURCEMAPS: 'true' @@ -156,7 +156,7 @@ variables: DOCKER_VERSION: "24.0.5" RUBYGEMS_VERSION: "3.4" GO_VERSION: "1.20" - RUST_VERSION: "1.65" + RUST_VERSION: "1.73" FLAKY_RSPEC_SUITE_REPORT_PATH: rspec/flaky/report-suite.json FRONTEND_FIXTURES_MAPPING_PATH: crystalball/frontend_fixtures_mapping.json |