NcamGnrvngu/gitlab-build-images
1
0
Fork 0
mirror of https://ops.gitlab.net/gitlab-org/gitlab-build-images.git synced 2025-12-09 18:12:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'sh-drop-ruby-2.7' into 'master'

Browse source 
Drop Ruby 2.7 builds

See merge request https://gitlab.com/gitlab-org/gitlab-build-images/-/merge_requests/706

Merged-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Co-authored-by: Stan Hu <stanhu@gmail.com>
This commit is contained in:
Balasankar 'Balu' C 2023-08-09 05:33:58 +00:00
commit 6baabc07e5
6 changed files with 9 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitlab/ci/cng-images.yml
View file

@ -7,7 +7,7 @@
YARN: '1.22'
GRAPHICSMAGICK: '1.3.36'
POSTGRESQL: '11'
RUBY: '2.7.patched'
RUBY: '3.0.patched'
GIT: '2.33'
GOLANG: '1.18'
KUBECTL: '1.23'

4
.gitlab/ci/e2e.images.yml
View file

@ -16,7 +16,7 @@ e2e:
OS: "debian:bullseye"
parallel:
matrix:
- RUBY: ['2.7', '3.0', '3.1', '3.2']
- RUBY: ['3.0', '3.1', '3.2']
BUNDLER: ['2.3', '2.4']
# Image with ruby, bundler and docker
@ -32,7 +32,7 @@ e2e-chrome:
- e2e-docker
parallel:
matrix:
- RUBY: ['2.7', '3.0', '3.1', '3.2']
- RUBY: ['3.0', '3.1', '3.2']
BUNDLER: ['2.3', '2.4']
CHROME: ['110', '113']

8
.gitlab/ci/gitlab.images.yml
View file

@ -23,7 +23,7 @@ gitlab:
parallel:
matrix:
- OS: ['debian:bullseye']
RUBY: ['2.7.patched', '3.0.patched', '3.1.patched', '3.2.patched']
RUBY: ['3.0.patched', '3.1.patched', '3.2.patched']
GIT: ['2.36']
POSTGRESQL: ['12', '13', '14', '15']
GOLANG: ['1.19', '1.20']
@ -45,7 +45,7 @@ gitlab-assets:
parallel:
matrix:
- OS: ['debian:bullseye']
RUBY: ['2.7', '3.0', '3.1', '3.2']
RUBY: ['3.0', '3.1', '3.2']
GIT: ['2.33']
NODE: ['18.17']
@ -72,12 +72,12 @@ gitlab-workhorse:
parallel:
matrix:
- OS: ['debian:bullseye']
RUBY: ['2.7', '3.0', '3.1', '3.2']
RUBY: ['3.0', '3.1', '3.2']
GOLANG: ['1.19', '1.20']
RUST: ['1.65']
GIT: ['2.36']
- OS: ['ubi:8.6']
RUBY: ['2.7', '3.0', '3.1', '3.2']
RUBY: ['3.0', '3.1', '3.2']
GOLANG: ['1.19', '1.20']
RUST: ['1.65']
GIT: ['2.36']

2
.gitlab/ci/kas.images.yml
View file

@ -23,4 +23,4 @@ gitlab-kas:
POSTGRESQL: '12'
parallel:
matrix:
- RUBY: ['2.7.2.patched', '2.7.patched', '3.0.patched']
- RUBY: ['3.0.patched', '3.1.patched', '3.2.patched']

17
scripts/lib/custom-docker-build
View file

@ -226,23 +226,6 @@ function print_bazelisk_args() {
function print_ruby_args() {
case "$1" in
2.6|2.6.*)
RUBY_VERSION="2.6.6"
RUBY_DOWNLOAD_SHA256="364b143def360bac1b74eb56ed60b1a0dca6439b00157ae11ff77d5cd2e92291"
;;
2.7|2.7.patched)
RUBY_VERSION="2.7.8"
RUBY_DOWNLOAD_SHA256="c2dab63cbc8f2a05526108ad419efa63a67ed4074dbbcf9fc2b1ca664cb45ba0"
;;
# Please update any clients still asking for these images to request `ruby-2.7` instead,
# which will provide the latest available patch level (see above.)
2.7.*)
RUBY_VERSION="2.7.2"
RUBY_DOWNLOAD_SHA256="6e5706d0d4ee4e1e2f883db9d768586b4d06567debea353c796ec45e8321c3d4"
;;
3.0|3.0.patched)
RUBY_VERSION="3.0.6"
RUBY_DOWNLOAD_SHA256="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e"

2
scripts/lib/custom-docker.sh
View file

@ -8,7 +8,7 @@ TAG_TOOLS=(BUNDLER RUBYGEMS GIT LFS CHROME YARN GRAPHICSMAGICK EXIFTOOL BAZELISK
# variables.
# For example, consider a CI job which specifies the following variables:
# OS: debian:bullseye
# RUBY: 2.7
# RUBY: 3.0
# GOLANG: 1.19
# RUST: 1.65.0
# GIT: 2.33