mirror of
https://ops.gitlab.net/gitlab-org/gitlab-build-images.git
synced 2025-12-09 18:12:55 +01:00
Merge branch 'bw-udpate-rust-to-1-73-0' into 'master'
Update to Rust 1.73.0 See merge request https://gitlab.com/gitlab-org/gitlab-build-images/-/merge_requests/742 Merged-by: Stan Hu <stanhu@gmail.com> Approved-by: Stan Hu <stanhu@gmail.com> Co-authored-by: Brett Walker <bwalker@gitlab.com>
This commit is contained in:
commit
f2da1cb145
6 changed files with 12 additions and 9 deletions
|
|
@ -19,9 +19,9 @@ gitaly:
|
|||
matrix:
|
||||
- OS: ['debian:bullseye']
|
||||
GOLANG: ['1.19', '1.20', '1.21']
|
||||
RUST: ['1.65']
|
||||
RUST: ['1.73']
|
||||
GIT: ['2.36']
|
||||
- OS: ['ubi:8.6']
|
||||
GOLANG: ['1.19', '1.20', '1.21']
|
||||
RUST: ['1.65']
|
||||
RUST: ['1.73']
|
||||
GIT: ['2.36']
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ gitlab:
|
|||
GIT: ['2.36']
|
||||
POSTGRESQL: ['12', '13', '14', '15']
|
||||
GOLANG: ['1.19', '1.20', '1.21']
|
||||
RUST: ['1.65']
|
||||
RUST: ['1.73']
|
||||
NODE: ['18.17']
|
||||
CHROME: ['113', '117']
|
||||
|
||||
|
|
@ -101,10 +101,10 @@ gitlab-workhorse:
|
|||
- OS: ['debian:bullseye']
|
||||
RUBY: ['3.0', '3.1', '3.2']
|
||||
GOLANG: ['1.19', '1.20', '1.21']
|
||||
RUST: ['1.65']
|
||||
RUST: ['1.73']
|
||||
GIT: ['2.36']
|
||||
- OS: ['ubi:8.6']
|
||||
RUBY: ['3.0', '3.1', '3.2']
|
||||
GOLANG: ['1.19', '1.20', '1.21']
|
||||
RUST: ['1.65']
|
||||
RUST: ['1.73']
|
||||
GIT: ['2.36']
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ gitlab-kas:
|
|||
- .kas
|
||||
variables:
|
||||
GOLANG: '1.19'
|
||||
RUST: '1.65'
|
||||
RUST: '1.73'
|
||||
LFS: '2.9'
|
||||
CHROME: '111'
|
||||
NODE: '18.17'
|
||||
|
|
|
|||
|
|
@ -100,7 +100,7 @@ new_image:
|
|||
OS: 'debian:bullseye'
|
||||
RUBY: '3.0'
|
||||
GOLANG: '1.15'
|
||||
RUST: '1.65.0'
|
||||
RUST: '1.73.0'
|
||||
GIT: '2.29'
|
||||
```
|
||||
|
||||
|
|
|
|||
|
|
@ -71,6 +71,9 @@ function print_rust_args() {
|
|||
1.65)
|
||||
INSTALL_RUST_VERSION="1.65.0"
|
||||
;;
|
||||
1.73)
|
||||
INSTALL_RUST_VERSION="1.73.0"
|
||||
;;
|
||||
*) fail "Unknown rust version $1" ;;
|
||||
esac
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ TAG_TOOLS=(BUNDLER RUBYGEMS GIT LFS CHROME YARN GRAPHICSMAGICK EXIFTOOL BAZELISK
|
|||
# OS: debian:bullseye
|
||||
# RUBY: 3.0
|
||||
# GOLANG: 1.19
|
||||
# RUST: 1.65.0
|
||||
# RUST: 1.73.0
|
||||
# GIT: 2.33
|
||||
# POSTGRESQL: 11
|
||||
# With the above variables, this function will return
|
||||
|
|
@ -45,7 +45,7 @@ function get_image_path() {
|
|||
# OS: debian:bullseye
|
||||
# RUBY: 2.7
|
||||
# GOLANG: 1.19
|
||||
# RUST: 1.65.0
|
||||
# RUST: 1.73.0
|
||||
# GIT: 2.33
|
||||
# POSTGRESQL: 11
|
||||
# For that job, this function will return
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue