From e2e975cbd87f8040ed2760cb46ba537fd29005a9 Mon Sep 17 00:00:00 2001
From: Jennifer Li <jli@gitlab.com>
Date: Thu, 19 Sep 2024 00:07:22 +0000
Subject: [PATCH] Improve workflow rule to use RUBY_VERSION_NEXT in foss
scheduled pipeline
---
.gitlab-ci.yml | 4 ++++
.gitlab/ci/version.yml | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b3447151f6af0..00316473b3b05 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -119,6 +119,10 @@ workflow:
<<: [*default-ruby-variables, *default-branch-pipeline-failure-variables]
CRYSTALBALL: "true"
PIPELINE_NAME: 'Scheduled Ruby $RUBY_VERSION $CI_COMMIT_BRANCH branch'
+ - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "schedule" && $BUILD_WITH_NEXT_RUBY_VERSION == "true"'
+ variables:
+ <<: *next-ruby-variables
+ PIPELINE_NAME: 'Scheduled Ruby $RUBY_VERSION $CI_COMMIT_BRANCH branch'
- if: '$CI_COMMIT_BRANCH == "ruby3_2" && $CI_PIPELINE_SOURCE == "schedule"'
variables:
<<: *next-ruby-variables
diff --git a/.gitlab/ci/version.yml b/.gitlab/ci/version.yml
index d2e626a37e4f7..a86cff2b9b3a2 100644
--- a/.gitlab/ci/version.yml
+++ b/.gitlab/ci/version.yml
@@ -14,7 +14,7 @@ variables:
NODE_VERSION: "20.12"
OS_VERSION: "bookworm"
RUBY_VERSION_DEFAULT: "3.1.5"
- RUBY_VERSION_NEXT: "3.2.5" # Keep this value consistent with the `[Nightly] Caches update for Ruby 3.2` gitlab-foss pipeline schedule setting. See https://gitlab.com/gitlab-org/gitlab/-/issues/488386#note_2115955499
+ RUBY_VERSION_NEXT: "3.2.5"
RUBYGEMS_VERSION: "3.4"
RUST_VERSION: "1.73"
UBI_VERSION: "8.6"
--
GitLab