From a652d7a26b29beac5595438f63dc0d51a29fff66 Mon Sep 17 00:00:00 2001
From: Baptiste Augrain <daiyam@zokugun.org>
Date: Thu, 6 Jun 2024 16:54:10 +0200
Subject: [PATCH] build(linux): make it build (#1916)

---
 .github/workflows/insider-linux.yml     | 4 ++--
 .github/workflows/stable-linux.yml      | 4 ++--
 package_alpine_reh.sh                   | 6 ++----
 package_linux_bin.sh                    | 2 +-
 package_linux_reh.sh                    | 1 +
 patches/linux/client/use-n16-libs.patch | 9 +++++++++
 6 files changed, 17 insertions(+), 9 deletions(-)
 create mode 100644 patches/linux/client/use-n16-libs.patch

diff --git a/.github/workflows/insider-linux.yml b/.github/workflows/insider-linux.yml
index 3d0da7d..caa192f 100644
--- a/.github/workflows/insider-linux.yml
+++ b/.github/workflows/insider-linux.yml
@@ -86,7 +86,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
         with:
-          node-version: '20.12'
+          node-version: '18.17'
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Install Yarn
@@ -264,7 +264,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
         with:
-          node-version: '20.12'
+          node-version: '18.17'
 
       - name: Setup Python 3
         uses: actions/setup-python@v5
diff --git a/.github/workflows/stable-linux.yml b/.github/workflows/stable-linux.yml
index 9704a8a..a95d19e 100644
--- a/.github/workflows/stable-linux.yml
+++ b/.github/workflows/stable-linux.yml
@@ -85,7 +85,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
         with:
-          node-version: '20.12'
+          node-version: '18.17'
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Install Yarn
@@ -263,7 +263,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
         with:
-          node-version: '20.12'
+          node-version: '18.17'
 
       - name: Setup Python 3
         uses: actions/setup-python@v5
diff --git a/package_alpine_reh.sh b/package_alpine_reh.sh
index ffe91fb..5cb1d70 100755
--- a/package_alpine_reh.sh
+++ b/package_alpine_reh.sh
@@ -12,14 +12,12 @@ tar -xzf ./vscode.tar.gz
 cd vscode || { echo "'vscode' dir not found"; exit 1; }
 
 export VSCODE_PLATFORM='alpine'
+export VSCODE_SKIP_NODE_VERSION_CHECK=1
 
 VSCODE_HOST_MOUNT="$( pwd )"
-
-export VSCODE_HOST_MOUNT
-
 VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:alpine-${VSCODE_ARCH}"
 
-export VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME
+export VSCODE_HOST_MOUNT VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME
 
 for i in {1..5}; do # try 5 times
   yarn --frozen-lockfile --check-files && break
diff --git a/package_linux_bin.sh b/package_linux_bin.sh
index 4c07465..3fecf7c 100755
--- a/package_linux_bin.sh
+++ b/package_linux_bin.sh
@@ -40,7 +40,7 @@ done
 ./build/azure-pipelines/linux/setup-env.sh
 
 for i in {1..5}; do # try 5 times
-  yarn --frozen-lockfile --check-files && break
+  yarn --check-files && break
   if [ $i -eq 3 ]; then
     echo "Yarn failed too many times" >&2
     exit 1
diff --git a/package_linux_reh.sh b/package_linux_reh.sh
index d2c015d..c81339d 100755
--- a/package_linux_reh.sh
+++ b/package_linux_reh.sh
@@ -17,6 +17,7 @@ if [[ "${VSCODE_ARCH}" == "ppc64le" ]]; then
 fi
 
 export VSCODE_PLATFORM='linux'
+export VSCODE_SKIP_NODE_VERSION_CHECK=1
 export VSCODE_SYSROOT_PREFIX="-glibc-${GLIBC_VERSION}"
 
 VSCODE_HOST_MOUNT="$( pwd )"
diff --git a/patches/linux/client/use-n16-libs.patch b/patches/linux/client/use-n16-libs.patch
new file mode 100644
index 0000000..aa605eb
--- /dev/null
+++ b/patches/linux/client/use-n16-libs.patch
@@ -0,0 +1,9 @@
+diff --git a/package.json b/package.json
+index fc7e1dd..bc0a020 100644
+--- a/package.json
++++ b/package.json
+@@ -135,3 +135,3 @@
+     "@vscode/gulp-electron": "^1.36.0",
+-    "@vscode/l10n-dev": "0.0.35",
++    "@vscode/l10n-dev": "0.0.30",
+     "@vscode/telemetry-extractor": "^1.10.2",