From 8af15e7962c615b4acee0318c1eeb5875190777d Mon Sep 17 00:00:00 2001
From: Lukas Eipert <leipert@gitlab.com>
Date: Tue, 13 Dec 2022 11:00:22 +0100
Subject: [PATCH 1/2] Add node@18 to the build matrix for the GitLab image

See: https://gitlab.com/gitlab-org/gitlab/-/issues/385512
---
 .gitlab/ci/gitlab.images.yml    | 4 ++--
 scripts/install-node            | 2 +-
 scripts/lib/custom-docker-build | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

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..e8874c2 100755
--- a/scripts/install-node
+++ b/scripts/install-node
@@ -2,7 +2,7 @@
 set -xeuo pipefail
 IFS=$'\n\t'
 
-NODE_INSTALL_VERSION=${1:-16.14.2}
+NODE_INSTALL_VERSION=${1:-18.12.1}
 YARN_INSTALL_VERSION=${2:-1.22.17}
 
 # Map MAJOR.MINOR.patch -> MAJOR.x
diff --git a/scripts/lib/custom-docker-build b/scripts/lib/custom-docker-build
index 8c66ed3..9df825f 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"

From 94efe6c2c4d4f594c2f59876e1e7ed38adf44269 Mon Sep 17 00:00:00 2001
From: Lukas Eipert <leipert@gitlab.com>
Date: Tue, 13 Dec 2022 11:03:19 +0100
Subject: [PATCH 2/2] Update yarn to latest patch

There has been no game-changer, but while we are at it, we can just
update it.
---
 scripts/install-node            | 2 +-
 scripts/lib/custom-docker-build | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/install-node b/scripts/install-node
index e8874c2..7e0233e 100755
--- a/scripts/install-node
+++ b/scripts/install-node
@@ -3,7 +3,7 @@ set -xeuo pipefail
 IFS=$'\n\t'
 
 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
 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 9df825f..84ff439 100755
--- a/scripts/lib/custom-docker-build
+++ b/scripts/lib/custom-docker-build
@@ -149,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"