diff --git a/.gitlab/ci/cng-images.yml b/.gitlab/ci/cng-images.yml index 46649e1..7a3aa7f 100644 --- a/.gitlab/ci/cng-images.yml +++ b/.gitlab/ci/cng-images.yml @@ -3,7 +3,7 @@ variables: LFS: '2.9' CHROME: '119' - NODE: '18.17' + NODE: '20.12' YARN: '1.22' GRAPHICSMAGICK: '1.3.36' POSTGRESQL: '11' diff --git a/.gitlab/ci/gitlab.images.yml b/.gitlab/ci/gitlab.images.yml index e49e2a3..fcdb397 100644 --- a/.gitlab/ci/gitlab.images.yml +++ b/.gitlab/ci/gitlab.images.yml @@ -39,14 +39,14 @@ gitlab: ARCH: linux/amd64,linux/arm64 GIT: '2.36' RUST: '1.73' - NODE: '18.17' parallel: matrix: - OS: ['debian:bookworm', 'debian:bookworm-slim'] RUBY: ['3.0.patched', '3.1.patched', '3.2.patched'] POSTGRESQL: ['13', '14', '15', '16'] - GOLANG: ['1.20', '1.21', '1.22'] - CHROME: ['120', '123'] + GOLANG: ['1.21', '1.22'] + CHROME: ['120'] + NODE: ['18.17', '20.12'] # Used by GitLab's compile-production-assets and compile-test-assets jobs gitlab-assets: @@ -64,7 +64,7 @@ gitlab-assets: - OS: ['debian:bookworm'] RUBY: ['3.0', '3.1', '3.2'] GIT: ['2.33'] - NODE: ['18.17'] + NODE: ['18.17', '20.12'] # Used by GitLab's Review app jobs and triage-ops ep-native-cloud-services: diff --git a/.gitlab/ci/kas.images.yml b/.gitlab/ci/kas.images.yml index e3817e7..abc8783 100644 --- a/.gitlab/ci/kas.images.yml +++ b/.gitlab/ci/kas.images.yml @@ -16,7 +16,6 @@ gitlab-kas: RUST: '1.73' LFS: '2.9' CHROME: '119' - NODE: '18.17' YARN: '1.22' GRAPHICSMAGICK: '1.3.36' GIT: '2.36' @@ -24,3 +23,4 @@ gitlab-kas: parallel: matrix: - RUBY: ['3.0.patched', '3.1.patched', '3.2.patched'] + NODE: ['18.17', '20.12'] \ No newline at end of file diff --git a/scripts/lib/custom-docker-build b/scripts/lib/custom-docker-build index 63fd10d..1358a75 100755 --- a/scripts/lib/custom-docker-build +++ b/scripts/lib/custom-docker-build @@ -153,7 +153,7 @@ function print_lfs_args() { function print_node_args() { case "$1" in 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" ;; esac printf -- "--build-arg NODE_INSTALL_VERSION=%s " "$NODE_INSTALL_VERSION"