diff --git a/.gitlab/ci/gitlab.images.yml b/.gitlab/ci/gitlab.images.yml index 5609ac0..e1543af 100644 --- a/.gitlab/ci/gitlab.images.yml +++ b/.gitlab/ci/gitlab.images.yml @@ -3,7 +3,6 @@ variables: LFS: '2.9' CHROME: '97' - NODE: '14.15' YARN: '1.22' GRAPHICSMAGICK: '1.3.36' parallel: @@ -13,6 +12,7 @@ GIT: ['2.33'] POSTGRESQL: ['11', '12', '13'] GOLANG: ['1.16', '1.17'] + NODE: ['14.15', '16.14'] gitlab test: extends: @@ -28,7 +28,6 @@ gitlab push: .gitlab-assets-matrix: variables: LFS: '2.9' - NODE: '14.15' YARN: '1.22' GRAPHICSMAGICK: '1.3.36' parallel: @@ -36,6 +35,7 @@ gitlab push: - DEBIAN: ['bullseye'] RUBY: ['2.7', '3.0'] GIT: ['2.31', '2.33'] + NODE: ['14.15', '16.14'] gitlab-assets test: extends: diff --git a/scripts/install-node b/scripts/install-node index 9624540..c97019f 100755 --- a/scripts/install-node +++ b/scripts/install-node @@ -2,8 +2,8 @@ set -xeuo pipefail IFS=$'\n\t' -NODE_INSTALL_VERSION=${1:-14.16.0} -YARN_INSTALL_VERSION=${2:-1.22.10} +NODE_INSTALL_VERSION=${1:-16.14.0} +YARN_INSTALL_VERSION=${2:-1.22.17} # Map MAJOR.MINOR.patch -> MAJOR.x NODE_MAJOR=`echo $NODE_INSTALL_VERSION | sed -r -e "s/([0-9]+)\.[0-9]+.*/\1\.x/g"`