Update to VSCodium 1.108.1

.github/dependabot.yml

@@ -7,5 +7,6 @@ version: 2
 updates:
   - package-ecosystem: "github-actions"
     directory: "/"
+    target-branch: insider
     schedule:
       interval: "weekly"

.github/workflows/stable-linux.yml

@@ -104,9 +104,9 @@ jobs:
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Setup Node.js environment
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
-          node-version: '20.19.0'
+          node-version-file: '.nvmrc'
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Setup Python 3
@@ -209,7 +209,7 @@ jobs:
         if: env.DISABLED != 'yes'
 
       - name: Install GH
-        run: ./install_gh.sh
+        run: ./build/linux/install_gh.sh
         if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
 
       - name: Check existing Codex tags/releases
@@ -331,9 +331,9 @@ jobs:
         if: env.DISABLED != 'yes'
 
       - name: Setup Node.js environment
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
-          node-version: '20.19.0'
+          node-version-file: '.nvmrc'
         if: env.DISABLED != 'yes'
 
       - name: Setup Python 3
@@ -347,7 +347,7 @@ jobs:
         if: env.DISABLED != 'yes'
 
       - name: Install GH
-        run: ./install_gh.sh
+        run: ./build/linux/install_gh.sh
         if: env.DISABLED != 'yes' && env.SHOULD_DEPLOY == 'yes'
 
       - name: Check existing Codex tags/releases
@@ -428,8 +428,13 @@ jobs:
           version: 10
           platform: x64
 
+      - name: Setup Node.js environment
+        uses: actions/setup-node@v6
+        with:
+          node-version-file: '.nvmrc'
+
       - name: Install GH
-        run: ./install_gh.sh
+        run: ./build/linux/install_gh.sh
         if: env.SHOULD_DEPLOY == 'yes'
 
       - name: Check existing Codex tags/releases

.github/workflows/stable-macos.yml

@@ -43,13 +43,13 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - runner: macos-13
+          - runner: macos-15-intel
             vscode_arch: x64
           - runner: macos-14
             vscode_arch: arm64
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           ref: ${{ env.GITHUB_BRANCH }}
 
@@ -59,12 +59,12 @@ jobs:
         run: . get_pr.sh
 
       - name: Setup Node.js environment
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
-          node-version: '20.19.0'
+          node-version-file: '.nvmrc'
 
       - name: Setup Python 3
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.11'
         if: env.VSCODE_ARCH == 'x64'
@@ -115,7 +115,7 @@ jobs:
         if: env.SHOULD_DEPLOY == 'yes'
 
       - name: Upload assets
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: bin-${{ matrix.vscode_arch }}
           path: assets/

.github/workflows/stable-windows.yml

@@ -100,9 +100,9 @@ jobs:
           platform: x64
 
       - name: Setup Node.js environment
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
-          node-version: "20.18.2"
+          node-version-file: '.nvmrc'
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Setup Python 3
@@ -181,9 +181,9 @@ jobs:
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Setup Node.js environment
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
-          node-version: '20.19.0'
+          node-version-file: '.nvmrc'
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Setup Python 3

.gitignore

@@ -17,6 +17,7 @@ build/linux/appimage/Codex
 build/windows/msi/releasedir
 build/windows/msi/Files*.wxs
 build/windows/msi/Files*.wixobj
+sourcemaps/
 stores/snapcraft/insider/*.snap
 stores/snapcraft/stable/*.snap
 node_modules

.nvmrc

@@ -1 +1 @@
-20.19.0
+22.21.1

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:20.19.0 as builder
+FROM node:22.21.1 as builder
 
 # Accept GITHUB_TOKEN as build argument
 ARG GITHUB_TOKEN
@@ -35,7 +35,7 @@ RUN ./dev/build.sh && \
     cp -r ./vscode/node_modules ./vscode-reh-web-linux-x64/
 
 
-FROM node:20.19.0 as runtime
+FROM node:22.21.1 as runtime
 COPY --from=builder /opt/vscodium/vscode-reh-web-linux-x64 /opt/codex
 
 ENV VSCODE_SERVER_HOST=0.0.0.0

build.sh

@@ -25,8 +25,12 @@ if [[ "${SHOULD_BUILD}" == "yes" ]]; then
   . ../get-extensions.sh
 
   if [[ "${OS_NAME}" == "osx" ]]; then
+    # remove win32 node modules
+    rm -f .build/extensions/ms-vscode.js-debug/src/win32-app-container-tokens.*.node
+
     # generate Group Policy definitions
-    node build/lib/policies darwin
+    npm run copy-policy-dto --prefix build
+    node build/lib/policies/policyGenerator.ts build/lib/policies/policyData.jsonc darwin
 
     npm run gulp "vscode-darwin-${VSCODE_ARCH}-min-ci"
 
@@ -36,13 +40,14 @@ if [[ "${SHOULD_BUILD}" == "yes" ]]; then
 
     VSCODE_PLATFORM="darwin"
   elif [[ "${OS_NAME}" == "windows" ]]; then
-    # generate Group Policy definitions
-    node build/lib/policies win32
-
     # in CI, packaging will be done by a different job
     if [[ "${CI_BUILD}" == "no" ]]; then
       . ../build/windows/rtf/make.sh
 
+      # generate Group Policy definitions
+      npm run copy-policy-dto --prefix build
+      node build/lib/policies/policyGenerator.ts build/lib/policies/policyData.jsonc win32
+
       npm run gulp "vscode-win32-${VSCODE_ARCH}-min-ci"
 
       if [[ "${VSCODE_ARCH}" != "x64" ]]; then
@@ -55,8 +60,15 @@ if [[ "${SHOULD_BUILD}" == "yes" ]]; then
 
     VSCODE_PLATFORM="win32"
   else # linux
+    # remove win32 node modules
+    rm -f .build/extensions/ms-vscode.js-debug/src/win32-app-container-tokens.*.node
+
     # in CI, packaging will be done by a different job
     if [[ "${CI_BUILD}" == "no" ]]; then
+      # generate Group Policy definitions
+      npm run copy-policy-dto --prefix build
+      node build/lib/policies/policyGenerator.ts build/lib/policies/policyData.jsonc linux
+
       npm run gulp "vscode-linux-${VSCODE_ARCH}-min-ci"
 
       find "../VSCode-linux-${VSCODE_ARCH}" -print0 | xargs -0 touch -c

build/alpine/package_reh.sh

@@ -34,14 +34,14 @@ fi
 
 for i in {1..5}; do # try 5 times
   npm ci && break
-  if [[ $i == 3 ]]; then
+  if [[ $i == 5 ]]; then
     echo "Npm install failed too many times" >&2
     exit 1
   fi
   echo "Npm install failed $i, trying again..."
 done
 
-node build/azure-pipelines/distro/mixin-npm
+node build/azure-pipelines/distro/mixin-npm.ts
 
 if [[ "${VSCODE_ARCH}" == "x64" ]]; then
   PA_NAME="linux-alpine"

build/linux/install_gh.sh

@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+
+set -ex
+
+GH_ARCH="amd64"
+
+for i in {1..5}; do
+  TAG=$( curl --retry 12 --retry-delay 30 "https://api.github.com/repos/cli/cli/releases/latest" 2>/dev/null | jq --raw-output '.tag_name' )
+
+  if [[ $? == 0 && "${TAG}" != "null" ]]; then
+    break
+  fi
+
+  if [[ $i == 5 ]]; then
+    echo "GH install failed too many times" >&2
+    exit 1
+  fi
+
+  echo "GH install failed $i, trying again..."
+
+  sleep $(( 15 * (i + 1)))
+done
+
+VERSION="${TAG#v}"
+
+curl --retry 12 --retry-delay 120 -sSL "https://github.com/cli/cli/releases/download/${TAG}/gh_${VERSION}_linux_${GH_ARCH}.tar.gz" -o "gh_${VERSION}_linux_${GH_ARCH}.tar.gz"
+
+tar xf "gh_${VERSION}_linux_${GH_ARCH}.tar.gz"
+
+cp "gh_${VERSION}_linux_${GH_ARCH}/bin/gh" /usr/local/bin/
+
+gh --version

build/linux/install_nodejs.sh

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+set -ex
+
+NODEJS_VERSION=$( cat .nvmrc )
+
+curl -fsSL "${NODEJS_SITE}${NODEJS_URLROOT}/v${NODEJS_VERSION}/node-v${NODEJS_VERSION}-linux-${NODEJS_ARCH}${NODEJS_URLSUFFIX}.tar.xz" -o node.tar.xz
+
+tar -xf node.tar.xz
+
+sudo mv "node-v${NODEJS_VERSION}-linux-${NODEJS_ARCH}${NODEJS_URLSUFFIX}" /usr/local/node
+
+echo "/usr/local/node/bin" >> $GITHUB_PATH

build/linux/loong64/electron.sh

@@ -2,5 +2,5 @@
 
 set -ex
 
-export ELECTRON_VERSION="34.5.4"
+export ELECTRON_VERSION="39.2.3"
 export VSCODE_ELECTRON_TAG="v${ELECTRON_VERSION}"

build/linux/loong64/electron.sha256sums

@@ -1,10 +1,9 @@
-cf8098d286cfb8d64ca430740084b2bd6f0152ee047e244897d94cc9a2df4d3f *chromedriver-v34.5.4-linux-loong64.zip
-7e7ea3a5bd29615bfc56ef2ccdd90228c39c6967de31c7181242e82ad50a1828 *electron-v34.5.4-linux-loong64-debug.zip
-78d894c1fa02fabae37cf61b8961b7c0d79e9c27078a68c68e299f09b1635ac1 *electron-v34.5.4-linux-loong64-symbols.zip
-28fe7821944b42de2065bda356a49d058d190ee02355ac3369f591a1af066252 *electron-v34.5.4-linux-loong64.zip
-ae61a77fc547493e8c30f1f52b0e1e9932a163cda261cac3c32fc453d9da8cde *hunspell-dictionaries.zip
-0bd2ce3eaa8f79ebf162babeb38fc1c3352bc5398ef442151e9d0f04f29e7416 *libcxx-headers.zip
-962b369d4166f43f8130ff16d632c25c5512975015ad74675b62cfdb6189199b *libcxx-objects-v34.5.4-linux-loong64.zip
-e468dba6a76ff95d3573ac5a57d4fd97e736663dab44d3c842de1974b9fc7b25 *libcxxabi-headers.zip
-4d1e508970b79d782e10e23e261211659dcf6edd6b01029011baf47becb95344 *mksnapshot-v34.5.4-linux-loong64.zip
-0d0e7f1de51994c95241b3b6c0ce822a44d6eca45e1981f2e61c1ca6386d5d29 *node-v34.5.4-headers.tar.gz
+d26b2189e7466a08c73861d0225c9b28730fdfc30918f3ea70853b43a2581dc4 *chromedriver-v39.2.3-linux-loong64.zip
+8cc36f7468f5b2d98cde3f73c10c535555754c54be43e45c320a382c35b8e466 *electron-v39.2.3-linux-loong64.zip
+f6e7462d6fd795ae2b08344ee0fdca817eba148b62a62717b3f512c845d96a64 *ffmpeg-v39.2.3-linux-loong64.zip
+b122599dc84b81526ba4eecbca4794f3a2d25300242ad3829d1445cb6948f470 *hunspell-dictionaries.zip
+76ef17d2810df5e77c5071863e2a375df914cfb7a362ad0582ee0eedca2441b9 *libcxx-headers.zip
+9b61ba9f0780a57ee2749f7963759395784eadcaccc54af313de1a540240298e *libcxx-objects-v39.2.3-linux-loong64.zip
+9ae64aff9e391eae401142e55654b5b8cf54d0611b1ecb540f2f4e89a2b4f772 *libcxxabi-headers.zip
+7d7e6e08c84aa38b74037f5910534918bc792ffbe2ca6d667067f587f27f5118 *mksnapshot-v39.2.3-linux-loong64.zip
+db48f8a9d2271e8b3a1c3f26ea1ae9bd489deb1b464b6ae424a15d5df7529fdc *node-v39.2.3-headers.tar.gz

build/linux/package_bin.sh

@@ -22,11 +22,10 @@ export VSCODE_SYSROOT_PREFIX='-glibc-2.28-gcc-10.5.0'
 
 if [[ "${VSCODE_ARCH}" == "arm64" || "${VSCODE_ARCH}" == "armhf" ]]; then
   export VSCODE_SKIP_SYSROOT=1
-  export USE_GNUPP2A=1
+  # export USE_GNUPP2A=1
 elif [[ "${VSCODE_ARCH}" == "ppc64le" ]]; then
   export VSCODE_SYSROOT_REPOSITORY='VSCodium/vscode-linux-build-agent'
   export VSCODE_SYSROOT_VERSION='20240129-253798'
-  export USE_GNUPP2A=1
   export ELECTRON_SKIP_BINARY_DOWNLOAD=1
   export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
   export VSCODE_SKIP_SETUPENV=1
@@ -102,7 +101,7 @@ fi
 
 for i in {1..5}; do # try 5 times
   npm ci --prefix build && break
-  if [[ $i == 3 ]]; then
+  if [[ $i == 5 ]]; then
     echo "Npm install failed too many times" >&2
     exit 1
   fi
@@ -119,14 +118,21 @@ fi
 
 for i in {1..5}; do # try 5 times
   npm ci && break
-  if [[ $i -eq 3 ]]; then
+  if [[ $i == 5 ]]; then
     echo "Npm install failed too many times" >&2
     exit 1
   fi
   echo "Npm install failed $i, trying again..."
 done
 
-node build/azure-pipelines/distro/mixin-npm
+node build/azure-pipelines/distro/mixin-npm.ts
+
+# delete native files built in the `compile` step
+find .build/extensions -type f -name '*.node' -print -delete
+
+# generate Group Policy definitions
+npm run copy-policy-dto --prefix build
+node build/lib/policies/policyGenerator.ts build/lib/policies/policyData.jsonc linux
 
 npm run gulp "vscode-linux-${VSCODE_ARCH}-min-ci"