Merge branch 'sh-add-ruby-3.1' into 'master'

Add Ruby 3.1 to build

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

Merged-by: Stan Hu <stanhu@gmail.com>
Approved-by: Stan Hu <stanhu@gmail.com>
This commit is contained in:
Stan Hu 2023-03-10 19:41:45 +00:00
commit 6cb9ebafe9
3 changed files with 172 additions and 27 deletions

View file

@ -13,26 +13,6 @@ gitlab:
extends:
- .gitlab
stage: gitlab
variables:
RUBYGEMS: '3.2'
LFS: '2.9'
YARN: '1.22'
GRAPHICSMAGICK: '1.3.36'
ARCH: linux/amd64,linux/arm64
parallel:
matrix:
- OS: ['debian:bullseye']
RUBY: ['2.7.patched', '3.0.patched']
GIT: ['2.36']
POSTGRESQL: ['11', '12', '13']
GOLANG: ['1.18', '1.19']
RUST: ['1.65']
NODE: ['16.14', '18.12']
CHROME: ['106', '109']
gitlab-ruby-3.2:
extends:
- .gitlab
variables:
RUBYGEMS: '3.4'
LFS: '2.9'
@ -42,12 +22,12 @@ gitlab-ruby-3.2:
parallel:
matrix:
- OS: ['debian:bullseye']
RUBY: ['3.2.patched']
RUBY: ['2.7.patched', '3.0.patched', '3.1.patched', '3.2.patched']
GIT: ['2.36']
POSTGRESQL: ['11', '12', '13']
GOLANG: ['1.19']
GOLANG: ['1.18', '1.19']
RUST: ['1.65']
NODE: ['16.14']
NODE: ['16.14', '18.12']
CHROME: ['109']
# Used by GitLab's compile-production-assets and compile-test-assets jobs
@ -56,7 +36,7 @@ gitlab-assets:
- .gitlab
stage: gitlab-assets
variables:
RUBYGEMS: '3.2'
RUBYGEMS: '3.4'
LFS: '2.9'
YARN: '1.22'
GRAPHICSMAGICK: '1.3.36'
@ -64,7 +44,7 @@ gitlab-assets:
parallel:
matrix:
- OS: ['debian:bullseye']
RUBY: ['2.7', '3.0']
RUBY: ['2.7', '3.0', '3.1', '3.2']
GIT: ['2.33']
NODE: ['16.14', '18.12']