Skip to content
代码片段 群组 项目
提交 ed50fde3 编辑于 作者: Lin Jen-Shin's avatar Lin Jen-Shin
浏览文件

We can always just specify NEXT_RUBY_VERSION

The default is 3.1.4 if NEXT_RUBY_VERSION is not presented
上级 dc790660
No related branches found
No related tags found
无相关合并请求
...@@ -30,17 +30,14 @@ default: ...@@ -30,17 +30,14 @@ default:
.old-ruby-variables: &old-ruby-variables .old-ruby-variables: &old-ruby-variables
RUBY_VERSION: "3.0" RUBY_VERSION: "3.0"
CACHE_EDITION: "GITLAB_RUBY3_0" CACHE_EDITION: "GITLAB_RUBY3_0"
USE_OLD_RUBY_VERSION: "true"
.default-ruby-variables: &default-ruby-variables .default-ruby-variables: &default-ruby-variables
RUBY_VERSION: "3.1" RUBY_VERSION: "3.1"
CACHE_EDITION: "GITLAB_RUBY3_1" CACHE_EDITION: "GITLAB_RUBY3_1"
USE_OLD_RUBY_VERSION: "true"
.next-ruby-variables: &next-ruby-variables .next-ruby-variables: &next-ruby-variables
RUBY_VERSION: "3.2" RUBY_VERSION: "3.2"
CACHE_EDITION: "GITLAB_RUBY3_2" CACHE_EDITION: "GITLAB_RUBY3_2"
USE_OLD_RUBY_VERSION: "false"
.default-branch-pipeline-failure-variables: &default-branch-pipeline-failure-variables .default-branch-pipeline-failure-variables: &default-branch-pipeline-failure-variables
CREATE_RAILS_TEST_FAILURE_ISSUES: "true" CREATE_RAILS_TEST_FAILURE_ISSUES: "true"
......
# Default variables for package-and-test # Default variables for package-and-test
variables: variables:
USE_OLD_RUBY_VERSION: "true"
REGISTRY_HOST: "registry.gitlab.com" REGISTRY_HOST: "registry.gitlab.com"
REGISTRY_GROUP: "gitlab-org" REGISTRY_GROUP: "gitlab-org"
ALLURE_JOB_NAME: $CI_PROJECT_NAME ALLURE_JOB_NAME: $CI_PROJECT_NAME
......
...@@ -90,7 +90,6 @@ trigger-omnibus: ...@@ -90,7 +90,6 @@ trigger-omnibus:
TOP_UPSTREAM_SOURCE_PROJECT: $CI_PROJECT_PATH TOP_UPSTREAM_SOURCE_PROJECT: $CI_PROJECT_PATH
SECURITY_SOURCES: $SECURITY_SOURCES SECURITY_SOURCES: $SECURITY_SOURCES
CACHE_UPDATE: $OMNIBUS_GITLAB_CACHE_UPDATE CACHE_UPDATE: $OMNIBUS_GITLAB_CACHE_UPDATE
USE_OLD_RUBY_VERSION: $USE_OLD_RUBY_VERSION
CACHE_EDITION: $CACHE_EDITION CACHE_EDITION: $CACHE_EDITION
NEXT_RUBY_VERSION: $FULL_RUBY_VERSION NEXT_RUBY_VERSION: $FULL_RUBY_VERSION
BUILD_ON_ALL_OS: $OMNIBUS_GITLAB_BUILD_ON_ALL_OS BUILD_ON_ALL_OS: $OMNIBUS_GITLAB_BUILD_ON_ALL_OS
......
...@@ -206,7 +206,6 @@ trigger-omnibus-env: ...@@ -206,7 +206,6 @@ trigger-omnibus-env:
echo "OMNIBUS_GITLAB_CACHE_UPDATE=${OMNIBUS_GITLAB_CACHE_UPDATE:-false}" >> $BUILD_ENV echo "OMNIBUS_GITLAB_CACHE_UPDATE=${OMNIBUS_GITLAB_CACHE_UPDATE:-false}" >> $BUILD_ENV
for version_file in *_VERSION; do echo "$version_file=$(cat $version_file)" >> $BUILD_ENV; done 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 "OMNIBUS_GITLAB_BUILD_ON_ALL_OS=${OMNIBUS_GITLAB_BUILD_ON_ALL_OS:-false}" >> $BUILD_ENV
echo "USE_OLD_RUBY_VERSION=${USE_OLD_RUBY_VERSION:-false}" >> $BUILD_ENV
ruby -e 'puts "FULL_RUBY_VERSION=#{RUBY_VERSION}"' >> $BUILD_ENV ruby -e 'puts "FULL_RUBY_VERSION=#{RUBY_VERSION}"' >> $BUILD_ENV
echo "GITLAB_ASSETS_TAG=$(assets_image_tag)" >> $BUILD_ENV echo "GITLAB_ASSETS_TAG=$(assets_image_tag)" >> $BUILD_ENV
echo "EE=$([[ $FOSS_ONLY == '1' ]] && echo 'false' || echo 'true')" >> $BUILD_ENV echo "EE=$([[ $FOSS_ONLY == '1' ]] && echo 'false' || echo 'true')" >> $BUILD_ENV
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册