diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-16 19:57:37 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-16 19:57:37 +0000 |
| commit | c00b0b2dedd4748d8f2d44c70c954d39e37d4696 (patch) | |
| tree | 1cdf77b5f12c4a523fde8817ee2773da355e6ea0 | |
| parent | 636d3d1ae24a4061e79ffbb239a358bf858e447e (diff) | |
| download | gitlab-ce-c00b0b2dedd4748d8f2d44c70c954d39e37d4696.tar.gz | |
Add latest changes from gitlab-org/gitlab@15-8-stable-ee
| -rw-r--r-- | .gitlab-ci.yml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5bb29a7aa3b..28ac2532f19 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,7 +30,7 @@ workflow: # If `$FORCE_GITLAB_CI` is set, create a pipeline. - if: '$FORCE_GITLAB_CI' variables: - RUBY_VERSION: "3.0" + RUBY_VERSION: "2.7" # 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 @@ -46,10 +46,10 @@ workflow: # For (detached) merge request pipelines. - if: '$CI_MERGE_REQUEST_IID' variables: - RUBY_VERSION: "3.0" - OMNIBUS_GITLAB_RUBY3_BUILD: "true" - OMNIBUS_GITLAB_CACHE_EDITION: "GITLAB_RUBY3" - PIPELINE_NAME: 'Ruby 3 $CI_MERGE_REQUEST_EVENT_TYPE MR pipeline' + RUBY_VERSION: "2.7" + OMNIBUS_GITLAB_RUBY2_BUILD: "true" + OMNIBUS_GITLAB_CACHE_EDITION: "GITLAB_RUBY2" + PIPELINE_NAME: 'Ruby 2 $CI_MERGE_REQUEST_EVENT_TYPE MR pipeline' # For the scheduled pipelines, we set specific variables. - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "schedule"' variables: |