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-add-nodejs-20-12-images' into 'master'

Browse source 
Upgrade to nodejs v20.12.2

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

Merged-by: Stan Hu <stanhu@gmail.com>
Approved-by: Stan Hu <stanhu@gmail.com>
This commit is contained in:
Stan Hu 2024-04-15 20:32:30 +00:00
commit 7c73660c30
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,7 +3,7 @@
variables: variables:
LFS: '2.9' LFS: '2.9'
CHROME: '119' CHROME: '119'
NODE: '18.17' NODE: '20.12'
YARN: '1.22' YARN: '1.22'
GRAPHICSMAGICK: '1.3.36' GRAPHICSMAGICK: '1.3.36'
POSTGRESQL: '11' POSTGRESQL: '11'

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

@ -39,14 +39,14 @@ gitlab:
ARCH: linux/amd64,linux/arm64 ARCH: linux/amd64,linux/arm64
GIT: '2.36' GIT: '2.36'
RUST: '1.73' RUST: '1.73'
NODE: '18.17'
parallel: parallel:
matrix: matrix:
- OS: ['debian:bookworm', 'debian:bookworm-slim'] - OS: ['debian:bookworm', 'debian:bookworm-slim']
RUBY: ['3.0.patched', '3.1.patched', '3.2.patched'] RUBY: ['3.0.patched', '3.1.patched', '3.2.patched']
POSTGRESQL: ['13', '14', '15', '16'] POSTGRESQL: ['13', '14', '15', '16']
GOLANG: ['1.20', '1.21', '1.22'] GOLANG: ['1.21', '1.22']
CHROME: ['120', '123'] CHROME: ['120']
NODE: ['18.17', '20.12']
# Used by GitLab's compile-production-assets and compile-test-assets jobs # Used by GitLab's compile-production-assets and compile-test-assets jobs
gitlab-assets: gitlab-assets:
@ -64,7 +64,7 @@ gitlab-assets:
- OS: ['debian:bookworm'] - OS: ['debian:bookworm']
RUBY: ['3.0', '3.1', '3.2'] RUBY: ['3.0', '3.1', '3.2']
GIT: ['2.33'] GIT: ['2.33']
NODE: ['18.17'] NODE: ['18.17', '20.12']
# Used by GitLab's Review app jobs and triage-ops # Used by GitLab's Review app jobs and triage-ops
ep-native-cloud-services: ep-native-cloud-services:

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

@ -16,7 +16,6 @@ gitlab-kas:
RUST: '1.73' RUST: '1.73'
LFS: '2.9' LFS: '2.9'
CHROME: '119' CHROME: '119'
NODE: '18.17'
YARN: '1.22' YARN: '1.22'
GRAPHICSMAGICK: '1.3.36' GRAPHICSMAGICK: '1.3.36'
GIT: '2.36' GIT: '2.36'
@ -24,3 +23,4 @@ gitlab-kas:
parallel: parallel:
matrix: matrix:
- RUBY: ['3.0.patched', '3.1.patched', '3.2.patched'] - RUBY: ['3.0.patched', '3.1.patched', '3.2.patched']
NODE: ['18.17', '20.12']

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

@ -153,7 +153,7 @@ function print_lfs_args() {
function print_node_args() { function print_node_args() {
case "$1" in case "$1" in
18|18.17) NODE_INSTALL_VERSION=18.17.1 ;; 18|18.17) NODE_INSTALL_VERSION=18.17.1 ;;
20|20.9) NODE_INSTALL_VERSION=20.9.0 ;; 20|20.12) NODE_INSTALL_VERSION=20.12.2 ;;
*) fail "Unknown node version $1" ;; *) fail "Unknown node version $1" ;;
esac esac
printf -- "--build-arg NODE_INSTALL_VERSION=%s " "$NODE_INSTALL_VERSION" printf -- "--build-arg NODE_INSTALL_VERSION=%s " "$NODE_INSTALL_VERSION"