From 835c69ca80047bb6a8afc13ef56ccea444a396b0 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Thu, 23 May 2024 21:12:41 +0000
Subject: [PATCH] Revert "Merge branch 'sh-omnibus-cng-ruby-version' into
'master'"
This reverts merge request !152687
---
.gitlab-ci.yml | 4 ----
.gitlab/ci/cng/main.gitlab-ci.yml | 2 +-
.gitlab/ci/setup.gitlab-ci.yml | 2 +-
3 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ed79bafba7d03..35064e89941a4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,14 +30,10 @@ default:
.default-ruby-variables: &default-ruby-variables
RUBY_VERSION: "3.1"
OMNIBUS_GITLAB_CACHE_EDITION: "GITLAB_RUBY3_1"
- OMNIBUS_RUBY_VERSION: "3.1.5"
- CNG_RUBY_VERSION: "3.1.5"
.next-ruby-variables: &next-ruby-variables
RUBY_VERSION: "3.2"
OMNIBUS_GITLAB_CACHE_EDITION: "GITLAB_RUBY3_2"
- OMNIBUS_RUBY_VERSION: "3.2.4"
- CNG_RUBY_VERSION: "3.2.4"
.default-branch-pipeline-failure-variables: &default-branch-pipeline-failure-variables
CREATE_RAILS_FLAKY_TEST_ISSUES: "true"
diff --git a/.gitlab/ci/cng/main.gitlab-ci.yml b/.gitlab/ci/cng/main.gitlab-ci.yml
index 26b6c83395e83..d27a4ef4b0874 100644
--- a/.gitlab/ci/cng/main.gitlab-ci.yml
+++ b/.gitlab/ci/cng/main.gitlab-ci.yml
@@ -24,7 +24,7 @@ include:
script:
- 'ruby -r./scripts/trigger-build.rb -e "puts Trigger.variables_for_env_file(Trigger::CNG.new.variables)" > $BUILD_ENV'
- echo "GITLAB_ASSETS_TAG=$(assets_image_tag)" >> $BUILD_ENV
- - echo "FULL_RUBY_VERSION=${CNG_RUBY_VERSION}" >> $BUILD_ENV
+ - ruby -e 'puts "FULL_RUBY_VERSION=#{RUBY_VERSION}"' >> build.env
- cat $BUILD_ENV
artifacts:
reports:
diff --git a/.gitlab/ci/setup.gitlab-ci.yml b/.gitlab/ci/setup.gitlab-ci.yml
index 9fe520990269d..c3cc646ba5885 100644
--- a/.gitlab/ci/setup.gitlab-ci.yml
+++ b/.gitlab/ci/setup.gitlab-ci.yml
@@ -242,7 +242,7 @@ trigger-omnibus-env:
echo "OMNIBUS_GITLAB_CACHE_EDITION=${OMNIBUS_GITLAB_CACHE_EDITION}" >> $BUILD_ENV
for version_file in *_VERSION; do echo "$version_file=$(cat $version_file)" >> $BUILD_ENV; done
echo "OMNIBUS_GITLAB_BUILD_ON_ALL_OS=${OMNIBUS_GITLAB_BUILD_ON_ALL_OS:-false}" >> $BUILD_ENV
- echo "FULL_RUBY_VERSION=${OMNIBUS_RUBY_VERSION}" >> $BUILD_ENV
+ ruby -e 'puts "FULL_RUBY_VERSION=#{RUBY_VERSION}"' >> $BUILD_ENV
echo "SHORT_RUBY_VERSION=${RUBY_VERSION}" >> $BUILD_ENV
echo "GITLAB_ASSETS_TAG=$(assets_image_tag)" >> $BUILD_ENV
echo "EE=$([[ $FOSS_ONLY == '1' ]] && echo 'false' || echo 'true')" >> $BUILD_ENV
--
GitLab