NcamGnrvngu/gitlab-build-images
1
0
Fork 0
mirror of https://ops.gitlab.net/gitlab-org/gitlab-build-images.git synced 2025-12-11 11:02:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'leipert-add-node-18-to-matrix' into 'master'

Browse source 
Add node@18 to the build matrix for the GitLab image

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

Merged-by: Rémy Coutable <remy@rymai.me>
Approved-by: Rémy Coutable <remy@rymai.me>
Co-authored-by: Lukas Eipert <leipert@gitlab.com>
This commit is contained in:
Rémy Coutable 2022-12-13 13:11:09 +00:00
commit 503a5bb421
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -17,7 +17,7 @@ gitlab:
POSTGRESQL: ['11', '12', '13'] POSTGRESQL: ['11', '12', '13']
GOLANG: ['1.18', '1.19'] GOLANG: ['1.18', '1.19']
RUST: ['1.65.0'] RUST: ['1.65.0']
NODE: ['16.14'] NODE: ['16.14', '18.12']
CHROME: ['106', '107'] CHROME: ['106', '107']
# Used by GitLab's compile-production-assets and compile-test-assets jobs # Used by GitLab's compile-production-assets and compile-test-assets jobs
@ -36,7 +36,7 @@ gitlab-assets:
- OS: ['debian:bullseye'] - OS: ['debian:bullseye']
RUBY: ['2.7', '3.0'] RUBY: ['2.7', '3.0']
GIT: ['2.33'] GIT: ['2.33']
NODE: ['16.14'] NODE: ['16.14', '18.12']
# Used by GitLab's Review app jobs # Used by GitLab's Review app jobs
gitlab-review-app: gitlab-review-app:

4
scripts/install-node
View file

@ -2,8 +2,8 @@
set -xeuo pipefail set -xeuo pipefail
IFS=$'\n\t' IFS=$'\n\t'
NODE_INSTALL_VERSION=${1:-16.14.2} NODE_INSTALL_VERSION=${1:-18.12.1}
YARN_INSTALL_VERSION=${2:-1.22.17} YARN_INSTALL_VERSION=${2:-1.22.19}
# Map MAJOR.MINOR.patch -> MAJOR.x # Map MAJOR.MINOR.patch -> MAJOR.x
NODE_MAJOR=`echo $NODE_INSTALL_VERSION | sed -r -e "s/([0-9]+)\.[0-9]+.*/\1\.x/g"` NODE_MAJOR=`echo $NODE_INSTALL_VERSION | sed -r -e "s/([0-9]+)\.[0-9]+.*/\1\.x/g"`

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

@ -138,6 +138,7 @@ function print_node_args() {
14.15) NODE_INSTALL_VERSION=14.15.4 ;; 14.15) NODE_INSTALL_VERSION=14.15.4 ;;
14|14.16) NODE_INSTALL_VERSION=14.16.0 ;; 14|14.16) NODE_INSTALL_VERSION=14.16.0 ;;
16|16.14) NODE_INSTALL_VERSION=16.14.2 ;; 16|16.14) NODE_INSTALL_VERSION=16.14.2 ;;
18|18.12) NODE_INSTALL_VERSION=18.12.1 ;;
*) 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"
@ -148,7 +149,7 @@ function print_yarn_args() {
1.12) YARN_INSTALL_VERSION=1.12.3 ;; 1.12) YARN_INSTALL_VERSION=1.12.3 ;;
1.16) YARN_INSTALL_VERSION=1.16.0 ;; 1.16) YARN_INSTALL_VERSION=1.16.0 ;;
1.21) YARN_INSTALL_VERSION=1.21.1 ;; 1.21) YARN_INSTALL_VERSION=1.21.1 ;;
1.22) YARN_INSTALL_VERSION=1.22.17 ;; 1.22) YARN_INSTALL_VERSION=1.22.19 ;;
*) fail "Unknown yarn version $1" ;; *) fail "Unknown yarn version $1" ;;
esac esac
printf -- "--build-arg YARN_INSTALL_VERSION=%s " "$YARN_INSTALL_VERSION" printf -- "--build-arg YARN_INSTALL_VERSION=%s " "$YARN_INSTALL_VERSION"