Merge branch 'andrey-drop-patch-versions' into 'master'

Drop patch version for rust

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

Merged-by: Stan Hu <stanhu@gmail.com>
Approved-by: Stan Hu <stanhu@gmail.com>
Co-authored-by: Andrejs Cunskis <acunskis@gitlab.com>
This commit is contained in:
Stan Hu 2023-02-07 16:25:48 +00:00
commit 9cfb653c95
4 changed files with 6 additions and 7 deletions

View file

@ -18,10 +18,10 @@ gitaly:
- OS: ['debian:bullseye']
RUBY: ['2.7', '3.0']
GOLANG: ['1.18', '1.19']
RUST: ['1.65.0']
RUST: ['1.65']
GIT: ['2.36']
- OS: ['ubi:8.6']
RUBY: ['2.7', '3.0']
GOLANG: ['1.18']
RUST: ['1.65.0']
RUST: ['1.65']
GIT: ['2.36']

View file

@ -26,7 +26,7 @@ gitlab:
GIT: ['2.36']
POSTGRESQL: ['11', '12', '13']
GOLANG: ['1.18', '1.19']
RUST: ['1.65.0']
RUST: ['1.65']
NODE: ['16.14', '18.12']
CHROME: ['106', '108']
@ -46,7 +46,7 @@ gitlab-ruby-3.2:
GIT: ['2.36']
POSTGRESQL: ['11', '12', '13']
GOLANG: ['1.19']
RUST: ['1.65.0']
RUST: ['1.65']
NODE: ['16.14']
CHROME: ['108']

View file

@ -13,7 +13,7 @@ gitlab-kas:
- .kas
variables:
GOLANG: '1.19'
RUST: '1.65.0'
RUST: '1.65'
LFS: '2.9'
CHROME: '107'
NODE: '14.15'

View file

@ -63,10 +63,9 @@ function print_golang_args() {
function print_rust_args() {
case "$1" in
1.65.0)
1.65)
INSTALL_RUST_VERSION="1.65.0"
;;
*) fail "Unknown rust version $1" ;;
esac