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

Create node v16 versions of our build images

Browse source
This commit is contained in:
Lukas Eipert 2021-11-26 15:21:06 +01:00
parent b2e4da6246
commit ce4f19b5aa
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,7 +3,6 @@
variables: variables:
LFS: '2.9' LFS: '2.9'
CHROME: '97' CHROME: '97'
NODE: '14.15'
YARN: '1.22' YARN: '1.22'
GRAPHICSMAGICK: '1.3.36' GRAPHICSMAGICK: '1.3.36'
parallel: parallel:
@ -13,6 +12,7 @@
GIT: ['2.33'] GIT: ['2.33']
POSTGRESQL: ['11', '12', '13'] POSTGRESQL: ['11', '12', '13']
GOLANG: ['1.16', '1.17'] GOLANG: ['1.16', '1.17']
NODE: ['14.15', '16.14']
gitlab test: gitlab test:
extends: extends:
@ -28,7 +28,6 @@ gitlab push:
.gitlab-assets-matrix: .gitlab-assets-matrix:
variables: variables:
LFS: '2.9' LFS: '2.9'
NODE: '14.15'
YARN: '1.22' YARN: '1.22'
GRAPHICSMAGICK: '1.3.36' GRAPHICSMAGICK: '1.3.36'
parallel: parallel:
@ -36,6 +35,7 @@ gitlab push:
- DEBIAN: ['bullseye'] - DEBIAN: ['bullseye']
RUBY: ['2.7', '3.0'] RUBY: ['2.7', '3.0']
GIT: ['2.31', '2.33'] GIT: ['2.31', '2.33']
NODE: ['14.15', '16.14']
gitlab-assets test: gitlab-assets test:
extends: extends:

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:-14.16.0} NODE_INSTALL_VERSION=${1:-16.14.0}
YARN_INSTALL_VERSION=${2:-1.22.10} YARN_INSTALL_VERSION=${2:-1.22.17}
# 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"`