diff --git a/.gitlab/ci/gitlab.images.yml b/.gitlab/ci/gitlab.images.yml index e174cb9..2fd64b0 100644 --- a/.gitlab/ci/gitlab.images.yml +++ b/.gitlab/ci/gitlab.images.yml @@ -17,7 +17,7 @@ gitlab: POSTGRESQL: ['11', '12', '13'] GOLANG: ['1.18', '1.19'] RUST: ['1.65.0'] - NODE: ['16.14'] + NODE: ['16.14', '18.12'] CHROME: ['106', '107'] # Used by GitLab's compile-production-assets and compile-test-assets jobs @@ -36,7 +36,7 @@ gitlab-assets: - OS: ['debian:bullseye'] RUBY: ['2.7', '3.0'] GIT: ['2.33'] - NODE: ['16.14'] + NODE: ['16.14', '18.12'] # Used by GitLab's Review app jobs gitlab-review-app: diff --git a/scripts/install-node b/scripts/install-node index 20f19d2..7e0233e 100755 --- a/scripts/install-node +++ b/scripts/install-node @@ -2,8 +2,8 @@ set -xeuo pipefail IFS=$'\n\t' -NODE_INSTALL_VERSION=${1:-16.14.2} -YARN_INSTALL_VERSION=${2:-1.22.17} +NODE_INSTALL_VERSION=${1:-18.12.1} +YARN_INSTALL_VERSION=${2:-1.22.19} # Map MAJOR.MINOR.patch -> MAJOR.x NODE_MAJOR=`echo $NODE_INSTALL_VERSION | sed -r -e "s/([0-9]+)\.[0-9]+.*/\1\.x/g"` diff --git a/scripts/lib/custom-docker-build b/scripts/lib/custom-docker-build index 8c66ed3..84ff439 100755 --- a/scripts/lib/custom-docker-build +++ b/scripts/lib/custom-docker-build @@ -138,6 +138,7 @@ function print_node_args() { 14.15) NODE_INSTALL_VERSION=14.15.4 ;; 14|14.16) NODE_INSTALL_VERSION=14.16.0 ;; 16|16.14) NODE_INSTALL_VERSION=16.14.2 ;; + 18|18.12) NODE_INSTALL_VERSION=18.12.1 ;; *) fail "Unknown node version $1" ;; esac 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.16) YARN_INSTALL_VERSION=1.16.0 ;; 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" ;; esac printf -- "--build-arg YARN_INSTALL_VERSION=%s " "$YARN_INSTALL_VERSION"