feat(update): directly use versions repo (#2216)

Signed-off-by: Thibaud CANALE <thican@thican.net>

.github/workflows/insider-linux.yml

@@ -24,6 +24,7 @@ on:
     - '**/*.md'
 
 env:
+  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
   APP_NAME: VSCodium
   ASSETS_REPOSITORY: ${{ github.repository }}-insiders
   BINARY_NAME: codium-insiders
@@ -48,9 +49,12 @@ jobs:
         with:
           ref: ${{ env.GITHUB_BRANCH }}
 
-      - name: Clone VSCode repo
+      - name: Switch to relevant branch
         env:
           PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }}
+        run: ./get_pr.sh
+
+      - name: Clone VSCode repo
         run: ./get_repo.sh
 
       - name: Check PR or cron
@@ -83,10 +87,21 @@ jobs:
           ref: ${{ env.GITHUB_BRANCH }}
         if: env.SHOULD_BUILD == 'yes'
 
+      - name: Switch to relevant branch
+        env:
+          PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }}
+        run: ./get_pr.sh
+
+      - name: Setup GCC
+        uses: egor-tensin/setup-gcc@v1
+        with:
+          version: 10
+          platform: x64
+
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
         with:
-          node-version: '18.17'
+          node-version: '20.18'
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Install Yarn
@@ -100,18 +115,17 @@ jobs:
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Install libkrb5-dev
-        run: sudo apt-get install -y libkrb5-dev
+        run: sudo apt-get update -y && sudo apt-get install -y libkrb5-dev
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Clone VSCode repo
-        env:
-          PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }}
         run: ./get_repo.sh
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Build
         env:
           SHOULD_BUILD_REH: 'no'
+          SHOULD_BUILD_REH_WEB: 'no'
         run: ./build.sh
         if: env.SHOULD_BUILD == 'yes'
 
@@ -124,7 +138,7 @@ jobs:
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Upload vscode artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: vscode
           path: ./vscode.tar.gz
@@ -140,19 +154,35 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        - vscode_arch: x64
+        - slug: X64
+          vscode_arch: x64
           npm_arch: x64
-          image: vscodium/vscodium-linux-build-agent:bionic-x64
-        - vscode_arch: arm64
+          image: vscodium/vscodium-linux-build-agent:focal-x64
+        - slug: ARM64
+          vscode_arch: arm64
           npm_arch: arm64
-          image: vscodium/vscodium-linux-build-agent:bionic-arm64
-        - vscode_arch: armhf
+          image: vscodium/vscodium-linux-build-agent:focal-arm64
+        - slug: ARM32
+          vscode_arch: armhf
           npm_arch: arm
-          image: vscodium/vscodium-linux-build-agent:bionic-armhf
+          image: vscodium/vscodium-linux-build-agent:focal-armhf
+        - slug: RISCV64
+          vscode_arch: riscv64
+          npm_arch: riscv64
+          image: vscodium/vscodium-linux-build-agent:focal-riscv64
+        - slug: LOONG64
+          vscode_arch: loong64
+          npm_arch: loong64
+          image: vscodium/vscodium-linux-build-agent:trixie-loong64
+        - slug: PPC64
+          vscode_arch: ppc64le
+          npm_arch: ppc64
+          image: vscodium/vscodium-linux-build-agent:focal-ppc64le
     container:
       image: ${{ matrix.image }}
     env:
       BUILD_SOURCEVERSION: ${{ needs.compile.outputs.BUILD_SOURCEVERSION }}
+      DISABLED: ${{ vars[format('DISABLE_INSIDER_LINUX_APP_{0}', matrix.slug)] }}
       MS_COMMIT: ${{ needs.check.outputs.MS_COMMIT }}
       MS_TAG: ${{ needs.check.outputs.MS_TAG }}
       RELEASE_VERSION: ${{ needs.check.outputs.RELEASE_VERSION }}
@@ -165,51 +195,59 @@ jobs:
       SHOULD_DEPLOY: ${{ env.SHOULD_DEPLOY }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ env.GITHUB_BRANCH }}
-        if: env.SHOULD_BUILD == 'yes'
+        if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes'
+
+      - name: Switch to relevant branch
+        env:
+          PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }}
+        run: ./get_pr.sh
+        if: env.DISABLED != 'yes'
 
       - name: Install GH
         run: ./install_gh.sh
-        if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
+        if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
 
       - name: Check existing VSCodium tags/releases
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CHECK_REH: 'no'
+          DISABLE_APPIMAGE: ${{ vars.DISABLE_INSIDER_APPIMAGE }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: ./check_tags.sh
-        if: env.SHOULD_BUILD == 'yes'
+        if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes'
 
       - name: Install libkrb5-dev
-        run: sudo apt-get install -y libkrb5-dev
-        if: env.SHOULD_BUILD == 'yes'
+        run: sudo apt-get update -y && sudo apt-get install -y libkrb5-dev
+        if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes'
 
       - name: Download vscode artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: vscode
-        if: env.SHOULD_BUILD == 'yes'
+        if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes'
 
       - name: Build
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           npm_config_arch: ${{ matrix.npm_arch }}
         run: ./package_linux_bin.sh
-        if: env.SHOULD_BUILD == 'yes'
+        if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes'
 
       - name: Prepare assets
         env:
           SHOULD_BUILD_REH: 'no'
+          SHOULD_BUILD_REH_WEB: 'no'
         run: ./prepare_assets.sh
-        if: env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true')
+        if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true')
 
       - name: Release
         env:
           GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }}
           GITHUB_USERNAME: ${{ github.repository_owner }}
         run: ./release.sh
-        if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
+        if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
 
       - name: Update versions repo
         env:
@@ -217,15 +255,15 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }}
           GITHUB_USERNAME: ${{ github.repository_owner }}
         run: ./update_version.sh
-        if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
+        if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
 
       - name: Upload assets
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: bin-${{ matrix.vscode_arch }}
           path: assets/
           retention-days: 3
-        if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'no' && github.event.inputs.generate_assets == 'true'
+        if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'no' && github.event.inputs.generate_assets == 'true'
 
   reh_linux:
     needs:
@@ -236,18 +274,30 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        - vscode_arch: x64
+        - slug: X64
+          vscode_arch: x64
           npm_arch: x64
-        - vscode_arch: arm64
+        - slug: ARM64
+          vscode_arch: arm64
           npm_arch: arm64
-        - vscode_arch: armhf
+        - slug: ARM32
+          vscode_arch: armhf
           npm_arch: arm
-        - vscode_arch: ppc64le
+        - slug: PPC64
+          vscode_arch: ppc64le
           npm_arch: ppc64
-        - vscode_arch: riscv64
+        - slug: RISCV64
+          vscode_arch: riscv64
           npm_arch: riscv64
+        - slug: LOONG64
+          vscode_arch: loong64
+          npm_arch: loong64
+        - slug: S390X
+          vscode_arch: s390x
+          npm_arch: s390x
     env:
       BUILD_SOURCEVERSION: ${{ needs.compile.outputs.BUILD_SOURCEVERSION }}
+      DISABLED: ${{ vars[format('DISABLE_INSIDER_LINUX_REH_{0}', matrix.slug)] }}
       MS_COMMIT: ${{ needs.check.outputs.MS_COMMIT }}
       MS_TAG: ${{ needs.check.outputs.MS_TAG }}
       RELEASE_VERSION: ${{ needs.check.outputs.RELEASE_VERSION }}
@@ -257,52 +307,70 @@ jobs:
     if: needs.check.outputs.SHOULD_BUILD == 'yes' || github.event.inputs.generate_assets == 'true'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ env.GITHUB_BRANCH }}
+        if: env.DISABLED != 'yes'
+
+      - name: Switch to relevant branch
+        env:
+          PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }}
+        run: ./get_pr.sh
+        if: env.DISABLED != 'yes'
+
+      - name: Setup GCC
+        uses: egor-tensin/setup-gcc@v1
+        with:
+          version: 10
+          platform: x64
+        if: env.DISABLED != 'yes'
 
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
         with:
-          node-version: '18.17'
+          node-version: '20.18'
+        if: env.DISABLED != 'yes'
 
       - name: Setup Python 3
         uses: actions/setup-python@v5
         with:
           python-version: '3.11'
+        if: env.DISABLED != 'yes'
 
       - name: Install libkrb5-dev
-        run: sudo apt-get install -y libkrb5-dev
+        run: sudo apt-get update -y && sudo apt-get install -y libkrb5-dev
+        if: env.DISABLED != 'yes'
 
       - name: Install GH
         run: ./install_gh.sh
-        if: env.SHOULD_DEPLOY == 'yes'
+        if: env.DISABLED != 'yes' && env.SHOULD_DEPLOY == 'yes'
 
       - name: Check existing VSCodium tags/releases
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CHECK_ONLY_REH: 'yes'
         run: ./check_tags.sh
+        if: env.DISABLED != 'yes'
 
       - name: Download vscode artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: vscode
-        if: env.SHOULD_BUILD_REH != 'no' || github.event.inputs.generate_assets == 'true'
+        if: env.DISABLED != 'yes' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no' || github.event.inputs.generate_assets == 'true')
 
       - name: Build
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           npm_config_arch: ${{ matrix.npm_arch }}
         run: ./package_linux_reh.sh
-        if: env.SHOULD_BUILD_REH != 'no' || github.event.inputs.generate_assets == 'true'
+        if: env.DISABLED != 'yes' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no' || github.event.inputs.generate_assets == 'true')
 
       - name: Release
         env:
           GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }}
           GITHUB_USERNAME: ${{ github.repository_owner }}
         run: ./release.sh
-        if: env.SHOULD_BUILD_REH != 'no' && env.SHOULD_DEPLOY == 'yes'
+        if: env.DISABLED != 'yes' && env.SHOULD_DEPLOY == 'yes' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no')
 
       - name: Upload assets
         uses: actions/upload-artifact@v4
@@ -310,7 +378,7 @@ jobs:
           name: reh-linux-${{ matrix.vscode_arch }}
           path: assets/
           retention-days: 3
-        if: env.SHOULD_DEPLOY == 'no' && github.event.inputs.generate_assets == 'true'
+        if: env.DISABLED != 'yes' && env.SHOULD_DEPLOY == 'no' && github.event.inputs.generate_assets == 'true'
 
   reh_alpine:
     needs:
@@ -329,6 +397,7 @@ jobs:
       BUILD_SOURCEVERSION: ${{ needs.compile.outputs.BUILD_SOURCEVERSION }}
       MS_COMMIT: ${{ needs.check.outputs.MS_COMMIT }}
       MS_TAG: ${{ needs.check.outputs.MS_TAG }}
+      OS_NAME: alpine
       RELEASE_VERSION: ${{ needs.check.outputs.RELEASE_VERSION }}
       SHOULD_BUILD: ${{ needs.check.outputs.SHOULD_BUILD }}
       SHOULD_DEPLOY: ${{ needs.check.outputs.SHOULD_DEPLOY }}
@@ -336,10 +405,21 @@ jobs:
     if: needs.check.outputs.SHOULD_BUILD == 'yes' || github.event.inputs.generate_assets == 'true'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ env.GITHUB_BRANCH }}
 
+      - name: Switch to relevant branch
+        env:
+          PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }}
+        run: ./get_pr.sh
+
+      - name: Setup GCC
+        uses: egor-tensin/setup-gcc@v1
+        with:
+          version: 10
+          platform: x64
+
       - name: Install GH
         run: ./install_gh.sh
         if: env.SHOULD_DEPLOY == 'yes'
@@ -351,11 +431,11 @@ jobs:
         run: ./check_tags.sh
 
       - name: Install libkrb5-dev
-        run: sudo apt-get install -y libkrb5-dev
+        run: sudo apt-get update -y && sudo apt-get install -y libkrb5-dev
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Download vscode artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: vscode
         if: env.SHOULD_BUILD_REH != 'no' || github.event.inputs.generate_assets == 'true'
@@ -424,10 +504,17 @@ jobs:
         platform:
         - amd64
         - arm64
-    if: needs.check.outputs.SHOULD_DEPLOY == 'yes'
+    if: needs.check.outputs.SHOULD_DEPLOY == 'yes' && vars.DISABLE_INSIDER_SNAP != 'yes'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ env.GITHUB_BRANCH }}
+
+      - name: Switch to relevant branch
+        env:
+          PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }}
+        run: ./get_pr.sh
 
       - uses: docker/setup-qemu-action@v3
 

.github/workflows/insider-macos.yml

@@ -40,9 +40,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - runner: macos-12
+          - runner: macos-13
             vscode_arch: x64
-          - runner: macos-14
+          - runner: [self-hosted, macOS, ARM64]
             vscode_arch: arm64
 
     steps:
@@ -50,19 +50,23 @@ jobs:
         with:
           ref: ${{ env.GITHUB_BRANCH }}
 
+      - name: Switch to relevant branch
+        env:
+          PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }}
+        run: . get_pr.sh
+
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
         with:
-          node-version: '20.12'
+          node-version: '20.18'
 
       - name: Setup Python 3
         uses: actions/setup-python@v5
         with:
           python-version: '3.11'
+        if: env.VSCODE_ARCH == 'x64'
 
       - name: Clone VSCode repo
-        env:
-          PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }}
         run: . get_repo.sh
 
       - name: Check PR or cron

.github/workflows/insider-spearhead.yml

@@ -38,7 +38,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
         with:
-          node-version: '20.12'
+          node-version: '20.18'
 
       - name: Clone VSCode repo
         run: . get_repo.sh

.github/workflows/insider-windows.yml

@@ -32,22 +32,13 @@ env:
   VSCODE_QUALITY: insider
 
 jobs:
-  build:
-    runs-on: windows-2019
-    defaults:
-      run:
-        shell: bash
-    env:
-      VSCODE_ARCH: ${{ matrix.vscode_arch }}
-    strategy:
-      fail-fast: false
-      matrix:
-        vscode_arch:
-          - x64
-          # - ia32
-          - arm64
+  check:
+    runs-on: ubuntu-latest
     outputs:
+      MS_COMMIT: ${{ env.MS_COMMIT }}
+      MS_TAG: ${{ env.MS_TAG }}
       RELEASE_VERSION: ${{ env.RELEASE_VERSION }}
+      SHOULD_BUILD: ${{ env.SHOULD_BUILD }}
       SHOULD_DEPLOY: ${{ env.SHOULD_DEPLOY }}
 
     steps:
@@ -55,22 +46,12 @@ jobs:
         with:
           ref: ${{ env.GITHUB_BRANCH }}
 
-      - name: Setup Node.js environment
-        uses: actions/setup-node@v4
-        with:
-          node-version: '20.12'
-
-      - name: Install Yarn
-        run: npm install -g yarn
-
-      - name: Setup Python 3
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.11'
-
-      - name: Clone VSCode repo
+      - name: Switch to relevant branch
         env:
           PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }}
+        run: ./get_pr.sh
+
+      - name: Clone VSCode repo
         run: ./get_repo.sh
 
       - name: Check PR or cron
@@ -81,21 +62,195 @@ jobs:
       - name: Check existing VSCodium tags/releases
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          CHECK_ALL: 'yes'
         run: ./check_tags.sh
-        if: env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true'
+
+  compile:
+    needs:
+      - check
+    runs-on: ubuntu-20.04
+    env:
+      MS_COMMIT: ${{ needs.check.outputs.MS_COMMIT }}
+      MS_TAG: ${{ needs.check.outputs.MS_TAG }}
+      RELEASE_VERSION: ${{ needs.check.outputs.RELEASE_VERSION }}
+      SHOULD_BUILD: ${{ (needs.check.outputs.SHOULD_BUILD == 'yes' || github.event.inputs.generate_assets == 'true') && 'yes' || 'no' }}
+      VSCODE_ARCH: 'x64'
+    outputs:
+      BUILD_SOURCEVERSION: ${{ env.BUILD_SOURCEVERSION }}
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ env.GITHUB_BRANCH }}
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Switch to relevant branch
+        env:
+          PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }}
+        run: ./get_pr.sh
+
+      - name: Setup GCC
+        uses: egor-tensin/setup-gcc@v1
+        with:
+          version: 10
+          platform: x64
+
+      - name: Setup Node.js environment
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20.18'
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Install Yarn
+        run: npm install -g yarn
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Setup Python 3
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Install libkrb5-dev
+        run: sudo apt-get update -y && sudo apt-get install -y libkrb5-dev
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Clone VSCode repo
+        run: ./get_repo.sh
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Build
+        env:
+          SHOULD_BUILD_REH: 'no'
+          SHOULD_BUILD_REH_WEB: 'no'
+        run: ./build.sh
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Compress vscode artifact
+        run: |
+          find vscode -type f -not -path "*/node_modules/*" -not -path "vscode/.build/node/*" -not -path "vscode/.git/*" > vscode.txt
+          echo "vscode/.build/extensions/node_modules" >> vscode.txt
+          echo "vscode/.git" >> vscode.txt
+          tar -czf vscode.tar.gz -T vscode.txt
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Upload vscode artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: vscode
+          path: ./vscode.tar.gz
+          retention-days: ${{ needs.check.outputs.SHOULD_DEPLOY == 'yes' && 30 || 1 }}
+        if: env.SHOULD_BUILD == 'yes'
+
+  build:
+    needs:
+      - check
+      - compile
+    runs-on: windows-2019
+    strategy:
+      fail-fast: false
+      matrix:
+        vscode_arch:
+          - x64
+          - arm64
+    defaults:
+      run:
+        shell: bash
+    env:
+      BUILD_SOURCEVERSION: ${{ needs.compile.outputs.BUILD_SOURCEVERSION }}
+      MS_COMMIT: ${{ needs.check.outputs.MS_COMMIT }}
+      MS_TAG: ${{ needs.check.outputs.MS_TAG }}
+      RELEASE_VERSION: ${{ needs.check.outputs.RELEASE_VERSION }}
+      SHOULD_BUILD: ${{ (needs.check.outputs.SHOULD_BUILD == 'yes' || github.event.inputs.generate_assets == 'true') && 'yes' || 'no' }}
+      SHOULD_DEPLOY: ${{ needs.check.outputs.SHOULD_DEPLOY }}
+      VSCODE_ARCH: ${{ matrix.vscode_arch }}
+    outputs:
+      RELEASE_VERSION: ${{ env.RELEASE_VERSION }}
+      SHOULD_DEPLOY: ${{ env.SHOULD_DEPLOY }}
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ env.GITHUB_BRANCH }}
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Switch to relevant branch
+        env:
+          PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }}
+        run: ./get_pr.sh
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Setup Node.js environment
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20.18'
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Install Yarn
+        run: npm install -g yarn
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Setup Python 3
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Check existing VSCodium tags/releases
+        env:
+          DISABLE_MSI: ${{ vars.DISABLE_INSIDER_MSI }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: ./check_tags.sh
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Download vscode artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: vscode
+        if: env.SHOULD_BUILD == 'yes'
 
       - name: Build
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           npm_config_arch: ${{ matrix.vscode_arch }}
           npm_config_target_arch: ${{ matrix.vscode_arch }}
-        run: ./build.sh
+        run: ./package_windows.sh
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Prepare assets
         run: ./prepare_assets.sh
         if: env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true')
 
+      - name: Upload unsigned artifacts
+        id: upload-unsigned-artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: unsigned-${{ matrix.vscode_arch }}
+          path: |
+            assets/*.exe
+            assets/*.msi
+          retention-days: 1
+        if: env.SHOULD_BUILD == 'yes' && vars.DISABLE_INSIDER_WINDOWS_SIGNING != 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true')
+
+      - name: Signing
+        uses: signpath/github-action-submit-signing-request@v1
+        with:
+          api-token: ${{ secrets.SIGNPATH_API_TOKEN }}
+          organization-id: ${{ secrets.SIGNPATH_ORGANIZATION_ID }}
+          project-slug: ${{ secrets.SIGNPATH_PROJECT_SLUG }}
+          signing-policy-slug: ${{ secrets.SIGNPATH_POLICY_SLUG }}
+          github-artifact-id: ${{ steps.upload-unsigned-artifacts.outputs.artifact-id }}
+          artifact-configuration-slug: ${{ matrix.vscode_arch }}
+          wait-for-completion: true
+          # 3h to manually approve the request
+          wait-for-completion-timeout-in-seconds: 10800
+          output-artifact-directory: assets/
+        if: env.SHOULD_BUILD == 'yes' && vars.DISABLE_INSIDER_WINDOWS_SIGNING != 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true')
+
+      - name: Prepare checksums
+        run: ./prepare_checksums.sh
+        if: env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true')
+
       - name: Release
         env:
           GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }}
@@ -141,7 +296,7 @@ jobs:
           RELEASE_VERSION: ${{ needs.build.outputs.RELEASE_VERSION }}
 
       - name: Release to WinGet
-        uses: vedantmgoyal2009/winget-releaser@v2
+        uses: vedantmgoyal9/winget-releaser@main
         with:
           identifier: ${{ env.APP_IDENTIFIER }}
           version: ${{ env.RELEASE_VERSION }}

.github/workflows/stable-linux.yml

@@ -24,6 +24,7 @@ on:
     - '**/*.md'
 
 env:
+  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
   APP_NAME: VSCodium
   ASSETS_REPOSITORY: ${{ github.repository }}
   BINARY_NAME: codium
@@ -47,9 +48,12 @@ jobs:
         with:
           ref: ${{ env.GITHUB_BRANCH }}
 
-      - name: Clone VSCode repo
+      - name: Switch to relevant branch
         env:
           PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }}
+        run: ./get_pr.sh
+
+      - name: Clone VSCode repo
         run: ./get_repo.sh
 
       - name: Check PR or cron
@@ -82,10 +86,21 @@ jobs:
           ref: ${{ env.GITHUB_BRANCH }}
         if: env.SHOULD_BUILD == 'yes'
 
+      - name: Switch to relevant branch
+        env:
+          PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }}
+        run: ./get_pr.sh
+
+      - name: Setup GCC
+        uses: egor-tensin/setup-gcc@v1
+        with:
+          version: 10
+          platform: x64
+
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
         with:
-          node-version: '18.17'
+          node-version: '20.18'
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Install Yarn
@@ -99,18 +114,17 @@ jobs:
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Install libkrb5-dev
-        run: sudo apt-get install -y libkrb5-dev
+        run: sudo apt-get update -y && sudo apt-get install -y libkrb5-dev
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Clone VSCode repo
-        env:
-          PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }}
         run: ./get_repo.sh
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Build
         env:
           SHOULD_BUILD_REH: 'no'
+          SHOULD_BUILD_REH_WEB: 'no'
         run: ./build.sh
         if: env.SHOULD_BUILD == 'yes'
 
@@ -123,7 +137,7 @@ jobs:
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Upload vscode artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: vscode
           path: ./vscode.tar.gz
@@ -139,19 +153,35 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        - vscode_arch: x64
+        - slug: X64
+          vscode_arch: x64
           npm_arch: x64
-          image: vscodium/vscodium-linux-build-agent:bionic-x64
-        - vscode_arch: arm64
+          image: vscodium/vscodium-linux-build-agent:focal-x64
+        - slug: ARM64
+          vscode_arch: arm64
           npm_arch: arm64
-          image: vscodium/vscodium-linux-build-agent:bionic-arm64
-        - vscode_arch: armhf
+          image: vscodium/vscodium-linux-build-agent:focal-arm64
+        - slug: ARM32
+          vscode_arch: armhf
           npm_arch: arm
-          image: vscodium/vscodium-linux-build-agent:bionic-armhf
+          image: vscodium/vscodium-linux-build-agent:focal-armhf
+        - slug: RISCV64
+          vscode_arch: riscv64
+          npm_arch: riscv64
+          image: vscodium/vscodium-linux-build-agent:focal-riscv64
+        - slug: LOONG64
+          vscode_arch: loong64
+          npm_arch: loong64
+          image: vscodium/vscodium-linux-build-agent:trixie-loong64
+        - slug: PPC64
+          vscode_arch: ppc64le
+          npm_arch: ppc64
+          image: vscodium/vscodium-linux-build-agent:focal-ppc64le
     container:
       image: ${{ matrix.image }}
     env:
       BUILD_SOURCEVERSION: ${{ needs.compile.outputs.BUILD_SOURCEVERSION }}
+      DISABLED: ${{ vars[format('DISABLE_STABLE_LINUX_APP_{0}', matrix.slug)] }}
       MS_COMMIT: ${{ needs.check.outputs.MS_COMMIT }}
       MS_TAG: ${{ needs.check.outputs.MS_TAG }}
       RELEASE_VERSION: ${{ needs.check.outputs.RELEASE_VERSION }}
@@ -164,51 +194,59 @@ jobs:
       SHOULD_DEPLOY: ${{ env.SHOULD_DEPLOY }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ env.GITHUB_BRANCH }}
-        if: env.SHOULD_BUILD == 'yes'
+        if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes'
+
+      - name: Switch to relevant branch
+        env:
+          PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }}
+        run: ./get_pr.sh
+        if: env.DISABLED != 'yes'
 
       - name: Install GH
         run: ./install_gh.sh
-        if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
+        if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
 
       - name: Check existing VSCodium tags/releases
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CHECK_REH: 'no'
+          DISABLE_APPIMAGE: ${{ vars.DISABLE_STABLE_APPIMAGE }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: ./check_tags.sh
-        if: env.SHOULD_BUILD == 'yes'
+        if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes'
 
       - name: Install libkrb5-dev
-        run: sudo apt-get install -y libkrb5-dev
-        if: env.SHOULD_BUILD == 'yes'
+        run: sudo apt-get update -y && sudo apt-get install -y libkrb5-dev
+        if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes'
 
       - name: Download vscode artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: vscode
-        if: env.SHOULD_BUILD == 'yes'
+        if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes'
 
       - name: Build
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           npm_config_arch: ${{ matrix.npm_arch }}
         run: ./package_linux_bin.sh
-        if: env.SHOULD_BUILD == 'yes'
+        if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes'
 
       - name: Prepare assets
         env:
           SHOULD_BUILD_REH: 'no'
+          SHOULD_BUILD_REH_WEB: 'no'
         run: ./prepare_assets.sh
-        if: env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true')
+        if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true')
 
       - name: Release
         env:
           GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }}
           GITHUB_USERNAME: ${{ github.repository_owner }}
         run: ./release.sh
-        if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
+        if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
 
       - name: Update versions repo
         env:
@@ -216,15 +254,15 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }}
           GITHUB_USERNAME: ${{ github.repository_owner }}
         run: ./update_version.sh
-        if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
+        if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
 
       - name: Upload assets
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: bin-${{ matrix.vscode_arch }}
           path: assets/
           retention-days: 3
-        if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'no' && github.event.inputs.generate_assets == 'true'
+        if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'no' && github.event.inputs.generate_assets == 'true'
 
   reh_linux:
     needs:
@@ -235,18 +273,30 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        - vscode_arch: x64
+        - slug: X64
+          vscode_arch: x64
           npm_arch: x64
-        - vscode_arch: arm64
+        - slug: ARM64
+          vscode_arch: arm64
           npm_arch: arm64
-        - vscode_arch: armhf
+        - slug: ARM32
+          vscode_arch: armhf
           npm_arch: arm
-        - vscode_arch: ppc64le
+        - slug: PPC64
+          vscode_arch: ppc64le
           npm_arch: ppc64
-        - vscode_arch: riscv64
+        - slug: RISCV64
+          vscode_arch: riscv64
           npm_arch: riscv64
+        - slug: LOONG64
+          vscode_arch: loong64
+          npm_arch: loong64
+        - slug: S390X
+          vscode_arch: s390x
+          npm_arch: s390x
     env:
       BUILD_SOURCEVERSION: ${{ needs.compile.outputs.BUILD_SOURCEVERSION }}
+      DISABLED: ${{ vars[format('DISABLE_STABLE_LINUX_REH_{0}', matrix.slug)] }}
       MS_COMMIT: ${{ needs.check.outputs.MS_COMMIT }}
       MS_TAG: ${{ needs.check.outputs.MS_TAG }}
       RELEASE_VERSION: ${{ needs.check.outputs.RELEASE_VERSION }}
@@ -256,52 +306,70 @@ jobs:
     if: needs.check.outputs.SHOULD_BUILD == 'yes' || github.event.inputs.generate_assets == 'true'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ env.GITHUB_BRANCH }}
+        if: env.DISABLED != 'yes'
+
+      - name: Switch to relevant branch
+        env:
+          PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }}
+        run: ./get_pr.sh
+        if: env.DISABLED != 'yes'
+
+      - name: Setup GCC
+        uses: egor-tensin/setup-gcc@v1
+        with:
+          version: 10
+          platform: x64
+        if: env.DISABLED != 'yes'
 
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
         with:
-          node-version: '18.17'
+          node-version: '20.18'
+        if: env.DISABLED != 'yes'
 
       - name: Setup Python 3
         uses: actions/setup-python@v5
         with:
           python-version: '3.11'
+        if: env.DISABLED != 'yes'
 
       - name: Install libkrb5-dev
-        run: sudo apt-get install -y libkrb5-dev
+        run: sudo apt-get update -y && sudo apt-get install -y libkrb5-dev
+        if: env.DISABLED != 'yes'
 
       - name: Install GH
         run: ./install_gh.sh
-        if: env.SHOULD_DEPLOY == 'yes'
+        if: env.DISABLED != 'yes' && env.SHOULD_DEPLOY == 'yes'
 
       - name: Check existing VSCodium tags/releases
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CHECK_ONLY_REH: 'yes'
         run: ./check_tags.sh
+        if: env.DISABLED != 'yes'
 
       - name: Download vscode artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: vscode
-        if: env.SHOULD_BUILD_REH != 'no' || github.event.inputs.generate_assets == 'true'
+        if: env.DISABLED != 'yes' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no' || github.event.inputs.generate_assets == 'true')
 
       - name: Build
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           npm_config_arch: ${{ matrix.npm_arch }}
         run: ./package_linux_reh.sh
-        if: env.SHOULD_BUILD_REH != 'no' || github.event.inputs.generate_assets == 'true'
+        if: env.DISABLED != 'yes' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no' || github.event.inputs.generate_assets == 'true')
 
       - name: Release
         env:
           GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }}
           GITHUB_USERNAME: ${{ github.repository_owner }}
         run: ./release.sh
-        if: env.SHOULD_BUILD_REH != 'no' && env.SHOULD_DEPLOY == 'yes'
+        if: env.DISABLED != 'yes' && env.SHOULD_DEPLOY == 'yes' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no')
 
       - name: Upload assets
         uses: actions/upload-artifact@v4
@@ -309,7 +377,7 @@ jobs:
           name: reh-linux-${{ matrix.vscode_arch }}
           path: assets/
           retention-days: 3
-        if: env.SHOULD_DEPLOY == 'no' && github.event.inputs.generate_assets == 'true'
+        if: env.DISABLED != 'yes' && env.SHOULD_DEPLOY == 'no' && github.event.inputs.generate_assets == 'true'
 
   reh_alpine:
     needs:
@@ -328,6 +396,7 @@ jobs:
       BUILD_SOURCEVERSION: ${{ needs.compile.outputs.BUILD_SOURCEVERSION }}
       MS_COMMIT: ${{ needs.check.outputs.MS_COMMIT }}
       MS_TAG: ${{ needs.check.outputs.MS_TAG }}
+      OS_NAME: alpine
       RELEASE_VERSION: ${{ needs.check.outputs.RELEASE_VERSION }}
       SHOULD_BUILD: ${{ needs.check.outputs.SHOULD_BUILD }}
       SHOULD_DEPLOY: ${{ needs.check.outputs.SHOULD_DEPLOY }}
@@ -335,10 +404,21 @@ jobs:
     if: needs.check.outputs.SHOULD_BUILD == 'yes' || github.event.inputs.generate_assets == 'true'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ env.GITHUB_BRANCH }}
 
+      - name: Switch to relevant branch
+        env:
+          PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }}
+        run: ./get_pr.sh
+
+      - name: Setup GCC
+        uses: egor-tensin/setup-gcc@v1
+        with:
+          version: 10
+          platform: x64
+
       - name: Install GH
         run: ./install_gh.sh
         if: env.SHOULD_DEPLOY == 'yes'
@@ -350,11 +430,11 @@ jobs:
         run: ./check_tags.sh
 
       - name: Install libkrb5-dev
-        run: sudo apt-get install -y libkrb5-dev
+        run: sudo apt-get update -y && sudo apt-get install -y libkrb5-dev
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Download vscode artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: vscode
         if: env.SHOULD_BUILD_REH != 'no' || github.event.inputs.generate_assets == 'true'
@@ -392,8 +472,8 @@ jobs:
         include:
         - package_name: vscodium
           package_type: stable
-        - package_name: vscodium-git
-          package_type: rolling
+        # - package_name: vscodium-git
+        #   package_type: rolling
     if: needs.check.outputs.SHOULD_DEPLOY == 'yes'
 
     steps:
@@ -420,15 +500,23 @@ jobs:
         platform:
         - amd64
         - arm64
-    if: needs.check.outputs.SHOULD_DEPLOY == 'yes'
+    if: needs.check.outputs.SHOULD_DEPLOY == 'yes' && vars.DISABLE_STABLE_SNAP != 'yes'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ env.GITHUB_BRANCH }}
+
+      - name: Switch to relevant branch
+        env:
+          PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }}
+        run: ./get_pr.sh
 
       - name: Check version
         env:
           ARCHITECTURE: ${{ matrix.platform }}
           GENERATE_ASSETS: ${{ github.event.inputs.generate_assets }}
+          SNAPCRAFT_STORE_CHANNEL: ${{ vars.SNAP_STORE_CHANNEL }}
           SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_STORE_LOGIN }}
         run: ./stores/snapcraft/check_version.sh
 
@@ -461,7 +549,7 @@ jobs:
           SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_STORE_LOGIN }}
         with:
           snap: ${{ steps.build.outputs.snap }}
-          release: stable
+          release: ${{ vars.SNAP_STORE_CHANNEL }}
         if: env.SHOULD_DEPLOY_TO_STORE == 'yes'
 
   deb-rpm-repo-hook:

.github/workflows/stable-macos.yml

@@ -39,19 +39,25 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - runner: macos-12
+          - runner: macos-13
             vscode_arch: x64
-          # - runner: macos-14
           - runner: [self-hosted, macOS, ARM64]
             vscode_arch: arm64
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          ref: ${{ env.GITHUB_BRANCH }}
+
+      - name: Switch to relevant branch
+        env:
+          PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }}
+        run: . get_pr.sh
 
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
         with:
-          node-version: '20.12'
+          node-version: '20.18'
 
       - name: Setup Python 3
         uses: actions/setup-python@v5
@@ -60,8 +66,6 @@ jobs:
         if: env.VSCODE_ARCH == 'x64'
 
       - name: Clone VSCode repo
-        env:
-          PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }}
         run: . get_repo.sh
 
       - name: Check PR or cron

.github/workflows/stable-spearhead.yml

@@ -33,7 +33,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
         with:
-          node-version: '20.12'
+          node-version: '20.18'
 
       - name: Clone VSCode repo
         run: . get_repo.sh

.github/workflows/stable-windows.yml

@@ -30,45 +30,27 @@ env:
   VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
   VSCODE_QUALITY: stable
 
-
 jobs:
-  build:
-    runs-on: windows-2019
-    defaults:
-      run:
-        shell: bash
-    env:
-      VSCODE_ARCH: ${{ matrix.vscode_arch }}
-    strategy:
-      fail-fast: false
-      matrix:
-        vscode_arch:
-          - x64
-          # - ia32
-          - arm64
+  check:
+    runs-on: ubuntu-latest
     outputs:
+      MS_COMMIT: ${{ env.MS_COMMIT }}
+      MS_TAG: ${{ env.MS_TAG }}
       RELEASE_VERSION: ${{ env.RELEASE_VERSION }}
+      SHOULD_BUILD: ${{ env.SHOULD_BUILD }}
       SHOULD_DEPLOY: ${{ env.SHOULD_DEPLOY }}
 
     steps:
       - uses: actions/checkout@v4
-
-      - name: Setup Node.js environment
-        uses: actions/setup-node@v4
         with:
-          node-version: '20.12'
+          ref: ${{ env.GITHUB_BRANCH }}
 
-      - name: Install Yarn
-        run: npm install -g yarn
-
-      - name: Setup Python 3
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.11'
-
-      - name: Clone VSCode repo
+      - name: Switch to relevant branch
         env:
           PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }}
+        run: ./get_pr.sh
+
+      - name: Clone VSCode repo
         run: ./get_repo.sh
 
       - name: Check PR or cron
@@ -79,22 +61,195 @@ jobs:
       - name: Check existing VSCodium tags/releases
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          CHECK_ALL: 'yes'
         run: ./check_tags.sh
-        if: env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true'
+
+  compile:
+    needs:
+      - check
+    runs-on: ubuntu-20.04
+    env:
+      MS_COMMIT: ${{ needs.check.outputs.MS_COMMIT }}
+      MS_TAG: ${{ needs.check.outputs.MS_TAG }}
+      RELEASE_VERSION: ${{ needs.check.outputs.RELEASE_VERSION }}
+      SHOULD_BUILD: ${{ (needs.check.outputs.SHOULD_BUILD == 'yes' || github.event.inputs.generate_assets == 'true') && 'yes' || 'no' }}
+      VSCODE_ARCH: 'x64'
+    outputs:
+      BUILD_SOURCEVERSION: ${{ env.BUILD_SOURCEVERSION }}
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ env.GITHUB_BRANCH }}
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Switch to relevant branch
+        env:
+          PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }}
+        run: ./get_pr.sh
+
+      - name: Setup GCC
+        uses: egor-tensin/setup-gcc@v1
+        with:
+          version: 10
+          platform: x64
+
+      - name: Setup Node.js environment
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20.18'
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Install Yarn
+        run: npm install -g yarn
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Setup Python 3
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Install libkrb5-dev
+        run: sudo apt-get update -y && sudo apt-get install -y libkrb5-dev
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Clone VSCode repo
+        run: ./get_repo.sh
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Build
+        env:
+          SHOULD_BUILD_REH: 'no'
+          SHOULD_BUILD_REH_WEB: 'no'
+        run: ./build.sh
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Compress vscode artifact
+        run: |
+          find vscode -type f -not -path "*/node_modules/*" -not -path "vscode/.build/node/*" -not -path "vscode/.git/*" > vscode.txt
+          echo "vscode/.build/extensions/node_modules" >> vscode.txt
+          echo "vscode/.git" >> vscode.txt
+          tar -czf vscode.tar.gz -T vscode.txt
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Upload vscode artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: vscode
+          path: ./vscode.tar.gz
+          retention-days: ${{ needs.check.outputs.SHOULD_DEPLOY == 'yes' && 30 || 1 }}
+        if: env.SHOULD_BUILD == 'yes'
+
+  build:
+    needs:
+      - check
+      - compile
+    runs-on: windows-2019
+    strategy:
+      fail-fast: false
+      matrix:
+        vscode_arch:
+          - x64
+          - arm64
+    defaults:
+      run:
+        shell: bash
+    env:
+      BUILD_SOURCEVERSION: ${{ needs.compile.outputs.BUILD_SOURCEVERSION }}
+      MS_COMMIT: ${{ needs.check.outputs.MS_COMMIT }}
+      MS_TAG: ${{ needs.check.outputs.MS_TAG }}
+      RELEASE_VERSION: ${{ needs.check.outputs.RELEASE_VERSION }}
+      SHOULD_BUILD: ${{ (needs.check.outputs.SHOULD_BUILD == 'yes' || github.event.inputs.generate_assets == 'true') && 'yes' || 'no' }}
+      SHOULD_DEPLOY: ${{ needs.check.outputs.SHOULD_DEPLOY }}
+      VSCODE_ARCH: ${{ matrix.vscode_arch }}
+    outputs:
+      RELEASE_VERSION: ${{ env.RELEASE_VERSION }}
+      SHOULD_DEPLOY: ${{ env.SHOULD_DEPLOY }}
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ env.GITHUB_BRANCH }}
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Switch to relevant branch
+        env:
+          PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }}
+        run: ./get_pr.sh
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Setup Node.js environment
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20.18'
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Install Yarn
+        run: npm install -g yarn
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Setup Python 3
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Check existing VSCodium tags/releases
+        env:
+          DISABLE_MSI: ${{ vars.DISABLE_STABLE_MSI }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: ./check_tags.sh
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Download vscode artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: vscode
+        if: env.SHOULD_BUILD == 'yes'
 
       - name: Build
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GITHUB_USERNAME: ${{ github.repository_owner }}
           npm_config_arch: ${{ matrix.vscode_arch }}
           npm_config_target_arch: ${{ matrix.vscode_arch }}
-        run: ./build.sh
+        run: ./package_windows.sh
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Prepare assets
         run: ./prepare_assets.sh
         if: env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true')
 
+      - name: Upload unsigned artifacts
+        id: upload-unsigned-artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: unsigned-${{ matrix.vscode_arch }}
+          path: |
+            assets/*.exe
+            assets/*.msi
+          retention-days: 1
+        if: env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true')
+
+      - name: Signing
+        uses: signpath/github-action-submit-signing-request@v1
+        with:
+          api-token: ${{ secrets.SIGNPATH_API_TOKEN }}
+          organization-id: ${{ secrets.SIGNPATH_ORGANIZATION_ID }}
+          project-slug: ${{ secrets.SIGNPATH_PROJECT_SLUG }}
+          signing-policy-slug: ${{ secrets.SIGNPATH_POLICY_SLUG }}
+          github-artifact-id: ${{ steps.upload-unsigned-artifacts.outputs.artifact-id }}
+          artifact-configuration-slug: ${{ matrix.vscode_arch }}
+          wait-for-completion: true
+          # 3h to manually approve the request
+          wait-for-completion-timeout-in-seconds: 10800
+          output-artifact-directory: assets/
+        if: env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true')
+
+      - name: Prepare checksums
+        run: ./prepare_checksums.sh
+        if: env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true')
+
       - name: Release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -107,7 +262,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }}
           GITHUB_USERNAME: ${{ github.repository_owner }}
         run: ./update_version.sh
-        if: env.SHOULD_DEPLOY == 'yes'
+        if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
 
       - name: Upload assets
         uses: actions/upload-artifact@v4
@@ -129,6 +284,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          ref: ${{ env.GITHUB_BRANCH }}
 
       - name: Check version
         run: ./stores/winget/check_version.sh
@@ -136,7 +293,7 @@ jobs:
           RELEASE_VERSION: ${{ needs.build.outputs.RELEASE_VERSION }}
 
       - name: Release to WinGet
-        uses: vedantmgoyal2009/winget-releaser@v2
+        uses: vedantmgoyal9/winget-releaser@main
         with:
           identifier: ${{ env.APP_IDENTIFIER }}
           version: ${{ env.RELEASE_VERSION }}

.github/workflows/stale.yml

@@ -21,5 +21,5 @@ jobs:
             This issue has been automatically marked as stale. **If this issue is still affecting you, please leave any comment**, and we'll keep it open. If you have any new additional information, please include it with your comment!
           close-issue-message: >
             This issue has been closed due to inactivity, and will not be monitored. If this is a bug and you can reproduce this issue, please open a new issue.
-          exempt-issue-labels: discussion
-          only-pr-labels: not-a-real-label
+          exempt-issue-labels: discussion,never-stale
+          only-pr-labels: needs-information

.nvmrc

@@ -1 +1 @@
-20.12
+20.18

README.md

@@ -187,6 +187,9 @@ The minimal version is limited by the core component Electron, you may want to c
 - [x] GNU/Linux x64 (`deb`, `rpm`, `AppImage`, `snap`, `tar.gz`)
 - [x] GNU/Linux arm64 (`deb`, `rpm`, `snap`, `tar.gz`)
 - [x] GNU/Linux armhf (`deb`, `rpm`, `tar.gz`)
+- [x] GNU/Linux riscv64 (`tar.gz`)
+- [x] GNU/Linux loong64 (`tar.gz`)
+- [x] GNU/Linux ppc64le (`tar.gz`)
 - [x] Windows 10 / Server 2012 R2 or newer x64
 - [x] Windows 10 / Server 2012 R2 or newer arm64
 
@@ -209,6 +212,10 @@ The minimal version is limited by the core component Electron, you may want to c
     <td><a href="https://github.com/daiyam" target="_blank">@daiyam</a></td>
     <td>for macOS certificate</td>
   </tr>
+  <tr>
+    <td><a href="https://signpath.org/" target="_blank"><img src="https://avatars.githubusercontent.com/u/34448643" height="30" alt="SignPath logo" /></a></td>
+    <td>free code signing on Windows provided by <a href="https://signpath.io/" target="_blank">SignPath.io</a>, certificate by <a href="https://signpath.org/" target="_blank">SignPath Foundation</a></td>
+  </tr>
 </table>
 
 ## <a id="license"></a>License

announcements-extra.json

@@ -1,7 +1,7 @@
 [
-   {
+  {
     "id": "#1227",
     "title": "Issue(macOS): manual update to `1.90.x`",
     "url": "https://github.com/VSCodium/vscodium/issues/1917"
-  },
+  }
 ]

build.sh

@@ -29,12 +29,16 @@ if [[ "${SHOULD_BUILD}" == "yes" ]]; then
 
     VSCODE_PLATFORM="darwin"
   elif [[ "${OS_NAME}" == "windows" ]]; then
-    . ../build/windows/rtf/make.sh
+    # in CI, packaging will be done by a different job
+    if [[ "${CI_BUILD}" == "no" ]]; then
+      . ../build/windows/rtf/make.sh
 
-    yarn gulp "vscode-win32-${VSCODE_ARCH}-min-ci"
+      yarn gulp "vscode-win32-${VSCODE_ARCH}-min-ci"
 
-    if [[ "${VSCODE_ARCH}" != "ia32" && "${VSCODE_ARCH}" != "x64" ]]; then
-      SHOULD_BUILD_REH="no"
+      if [[ "${VSCODE_ARCH}" != "x64" ]]; then
+        SHOULD_BUILD_REH="no"
+        SHOULD_BUILD_REH_WEB="no"
+      fi
     fi
 
     VSCODE_PLATFORM="win32"
@@ -50,13 +54,14 @@ if [[ "${SHOULD_BUILD}" == "yes" ]]; then
   fi
 
   if [[ "${SHOULD_BUILD_REH}" != "no" ]]; then
-    if [[ "${OS_NAME}" == "linux" ]]; then
-      export VSCODE_NODE_GLIBC='-glibc-2.17'
-    fi
-
     yarn gulp minify-vscode-reh
     yarn gulp "vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}-min-ci"
   fi
 
+  if [[ "${SHOULD_BUILD_REH_WEB}" != "no" ]]; then
+    yarn gulp minify-vscode-reh-web
+    yarn gulp "vscode-reh-web-${VSCODE_PLATFORM}-${VSCODE_ARCH}-min-ci"
+  fi
+
   cd ..
 fi

build/build.sh

@@ -53,12 +53,16 @@ esac
 
 UNAME_ARCH=$( uname -m )
 
-if [[ "${UNAME_ARCH}" == "arm64" ]]; then
+if [[ "${UNAME_ARCH}" == "aarch64" || "${UNAME_ARCH}" == "arm64" ]]; then
   export VSCODE_ARCH="arm64"
 elif [[ "${UNAME_ARCH}" == "ppc64le" ]]; then
   export VSCODE_ARCH="ppc64le"
 elif [[ "${UNAME_ARCH}" == "riscv64" ]]; then
   export VSCODE_ARCH="riscv64"
+elif [[ "${UNAME_ARCH}" == "loongarch64" ]]; then
+  export VSCODE_ARCH="loong64"
+elif [[ "${UNAME_ARCH}" == "s390x" ]]; then
+  export VSCODE_ARCH="s390x"
 else
   export VSCODE_ARCH="x64"
 fi
@@ -86,7 +90,7 @@ if [[ "${SKIP_SOURCE}" == "no" ]]; then
   echo "BUILD_SOURCEVERSION=\"${BUILD_SOURCEVERSION}\"" >> build.env
 else
   if [[ "${SKIP_ASSETS}" != "no" ]]; then
-    rm -rf VSCode*
+    rm -rf vscode-* VSCode-*
   fi
 
   . build.env
@@ -104,11 +108,31 @@ if [[ "${SKIP_BUILD}" == "no" ]]; then
     git add .
     git reset -q --hard HEAD
 
+    rm -rf .build out*
+
     cd ..
   fi
 
+  if [[ -f "./include_${OS_NAME}.gypi" ]]; then
+    echo "Installing custom ~/.gyp/include.gypi"
+
+    mkdir -p ~/.gyp
+
+    if [[ -f "${HOME}/.gyp/include.gypi" ]]; then
+      mv ~/.gyp/include.gypi ~/.gyp/include.gypi.pre-vscodium
+    else
+      echo "{}" > ~/.gyp/include.gypi.pre-vscodium
+    fi
+
+    cp ./include_osx.gypi ~/.gyp/include.gypi
+  fi
+
   . build.sh
 
+  if [[ -f "./include_${OS_NAME}.gypi" ]]; then
+    mv ~/.gyp/include.gypi.pre-vscodium ~/.gyp/include.gypi
+  fi
+
   if [[ "${VSCODE_LATEST}" == "yes" ]]; then
     jsonTmp=$( cat "${VSCODE_QUALITY}.json" | jq --arg 'tag' "${MS_TAG/\-insider/}" --arg 'commit' "${MS_COMMIT}" '. | .tag=$tag | .commit=$commit' )
     echo "${jsonTmp}" > "${VSCODE_QUALITY}.json" && unset jsonTmp

build/linux/appimage/build.sh

@@ -37,6 +37,8 @@ if [[ "${VSCODE_ARCH}" == "x64" ]]; then
     sed -i 's|@@ICON@@|vscodium|g' recipe.yml
   fi
 
+  # workaround that enforces x86 ARCH for pkg2appimage having /__w/vscodium/vscodium/build/linux/appimage/VSCodium/VSCodium.AppDir/usr/share/codium/resources/app/node_modules/rc/index.js is of architecture armhf
+  export ARCH=x86_64
   bash -ex pkg2appimage.AppDir/AppRun recipe.yml
 
   rm -f pkg2appimage-*.AppImage

build/update_patches.sh

@@ -12,69 +12,69 @@ while getopts ":i" opt; do
   esac
 done
 
+check_file() {
+  while [ $# -gt 1 ]; do
+    git apply --reject "${1}"
+
+    shift
+  done
+
+  if [[ -f "${1}" ]]; then
+    echo applying patch: "${1}"
+    if ! git apply --ignore-whitespace "${1}"; then
+      echo failed to apply patch "${1}"
+
+      git apply --reject "${1}"
+      git apply --reject "../patches/helper/settings.patch"
+
+      read -rp "Press any key when the conflict have been resolved..." -n1 -s
+
+      git restore .vscode/settings.json
+      git add .
+      git diff --staged -U1 > "${1}"
+    fi
+    git add .
+    git reset -q --hard HEAD
+  fi
+}
+
 cd vscode || { echo "'vscode' dir not found"; exit 1; }
 
 git add .
 git reset -q --hard HEAD
 
 for FILE in ../patches/*.patch; do
-  if [[ -f "${FILE}" ]]; then
-    echo applying patch: "${FILE}"
-    if ! git apply --ignore-whitespace "${FILE}"; then
-      echo failed to apply patch "${FILE}"
-
-      git apply --reject "${FILE}"
-      git apply --reject "../patches/helper/settings.patch"
-
-      read -rp "Press any key when the conflict have been resolved..." -n1 -s
-
-      git restore .vscode/settings.json
-      git add .
-      git diff --staged -U1 > "${FILE}"
-    fi
-    git add .
-    git reset -q --hard HEAD
-  fi
+  check_file "${FILE}"
 done
 
 if [[ "${VSCODE_QUALITY}" == "insider" ]]; then
   for FILE in ../patches/insider/*.patch; do
-    if [[ -f "${FILE}" ]]; then
-      echo applying patch: "${FILE}"
-      if ! git apply --ignore-whitespace "${FILE}"; then
-        echo failed to apply patch "${FILE}"
-
-        git apply --reject "${FILE}"
-        git apply --reject "../patches/helper/settings.patch"
-
-        read -rp "Press any key when the conflict have been resolved..." -n1 -s
-
-        git restore .vscode/settings.json
-        git add .
-        git diff --staged -U1 > "${FILE}"
-      fi
-      git add .
-      git reset -q --hard HEAD
-    fi
+    check_file "${FILE}"
   done
 fi
 
-for FILE in ../patches/linux/*.patch; do
-  if [[ -f "${FILE}" ]]; then
-    echo applying patch: "${FILE}"
-    if ! git apply --ignore-whitespace "${FILE}"; then
-      echo failed to apply patch "${FILE}"
-
-      git apply --reject "${FILE}"
-      git apply --reject "../patches/helper/settings.patch"
-
-      read -rp "Press any key when the conflict have been resolved..." -n1 -s
-
-      git restore .vscode/settings.json
-      git add .
-      git diff --staged -U1 > "${FILE}"
+for ARCH in alpine linux osx windows; do
+  for FILE in "../patches/${ARCH}/"*.patch; do
+    if [[ "${FILE}" != *"/arch-"* ]]; then
+      check_file "${FILE}"
     fi
-    git add .
-    git reset -q --hard HEAD
+  done
+
+  if [[ "${ARCH}" == "linux" ]]; then
+    check_file "../patches/linux/arch-0-support.patch"
+    check_file "../patches/linux/arch-0-support.patch" "../patches/linux/arch-1-ppc64le.patch"
+    check_file "../patches/linux/arch-0-support.patch" "../patches/linux/arch-1-ppc64le.patch" "../patches/linux/arch-2-riscv64.patch"
+    check_file "../patches/linux/arch-0-support.patch" "../patches/linux/arch-1-ppc64le.patch" "../patches/linux/arch-2-riscv64.patch" "../patches/linux/arch-3-loong64.patch"
+    check_file "../patches/linux/arch-0-support.patch" "../patches/linux/arch-1-ppc64le.patch" "../patches/linux/arch-2-riscv64.patch" "../patches/linux/arch-3-loong64.patch" "../patches/linux/arch-4-s390x.patch"
   fi
+
+  for TARGET in client reh; do
+    for FILE in "../patches/${ARCH}/${TARGET}/"*.patch; do
+      check_file "${FILE}"
+    done
+
+    for FILE in "../patches/${ARCH}/${TARGET}/"*/*.patch; do
+      check_file "${FILE}"
+    done
+  done
 done

check_tags.sh

@@ -3,17 +3,22 @@
 
 set -e
 
-if [[ -z "${GITHUB_TOKEN}" ]]; then
+if [[ -z "${GH_TOKEN}" ]] && [[ -z "${GITHUB_TOKEN}" ]] && [[ -z "${GH_ENTERPRISE_TOKEN}" ]] && [[ -z "${GITHUB_ENTERPRISE_TOKEN}" ]]; then
   echo "Will not build because no GITHUB_TOKEN defined"
   exit 0
+else
+  GITHUB_TOKEN="${GH_TOKEN:-${GITHUB_TOKEN:-${GH_ENTERPRISE_TOKEN:-${GITHUB_ENTERPRISE_TOKEN}}}}"
 fi
 
+# Support for GitHub Enterprise
+GH_HOST="${GH_HOST:-github.com}"
+
 APP_NAME_LC="$( echo "${APP_NAME}" | awk '{print tolower($0)}' )"
 
 if [[ "${SHOULD_DEPLOY}" == "no" ]]; then
   ASSETS="null"
 else
-  GITHUB_RESPONSE=$( curl -s -H "Authorization: token ${GITHUB_TOKEN}" "https://api.github.com/repos/${ASSETS_REPOSITORY}/releases/latest" )
+  GITHUB_RESPONSE=$( curl -s -H "Authorization: token ${GITHUB_TOKEN}" "https://api.${GH_HOST}/repos/${ASSETS_REPOSITORY}/releases/latest" )
   LATEST_VERSION=$( echo "${GITHUB_RESPONSE}" | jq -c -r '.tag_name' )
   RECHECK_ASSETS="${SHOULD_BUILD}"
 
@@ -93,6 +98,13 @@ elif [[ "${ASSETS}" != "null" ]]; then
       export SHOULD_BUILD_REH="no"
     fi
 
+    if [[ -z $( contains "${APP_NAME_LC}-reh-web-darwin-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" ) ]]; then
+      echo "Building on MacOS because we have no REH-web archive"
+      export SHOULD_BUILD="yes"
+    else
+      export SHOULD_BUILD_REH_WEB="no"
+    fi
+
     if [[ "${SHOULD_BUILD}" != "yes" ]]; then
       echo "Already have all the MacOS builds"
     fi
@@ -122,6 +134,7 @@ elif [[ "${ASSETS}" != "null" ]]; then
       fi
 
       export SHOULD_BUILD_REH="no"
+      export SHOULD_BUILD_REH_WEB="no"
 
       if [[ "${SHOULD_BUILD}" != "yes" ]]; then
         echo "Already have all the Windows arm64 builds"
@@ -150,14 +163,18 @@ elif [[ "${ASSETS}" != "null" ]]; then
         export SHOULD_BUILD_ZIP="no"
       fi
 
-      if [[ -z $( contains "${APP_NAME}-${VSCODE_ARCH}-${RELEASE_VERSION}.msi" ) ]]; then
+      if [[ "${DISABLE_MSI}" == "yes" ]]; then
+          export SHOULD_BUILD_MSI="no"
+      elif [[ -z $( contains "${APP_NAME}-${VSCODE_ARCH}-${RELEASE_VERSION}.msi" ) ]]; then
         echo "Building on Windows ia32 because we have no msi"
         export SHOULD_BUILD="yes"
       else
         export SHOULD_BUILD_MSI="no"
       fi
 
-      if [[ -z $( contains "${APP_NAME}-${VSCODE_ARCH}-updates-disabled-${RELEASE_VERSION}.msi" ) ]]; then
+      if [[ "${DISABLE_MSI}" == "yes" ]]; then
+          export SHOULD_BUILD_MSI_NOUP="no"
+      elif [[ -z $( contains "${APP_NAME}-${VSCODE_ARCH}-updates-disabled-${RELEASE_VERSION}.msi" ) ]]; then
         echo "Building on Windows ia32 because we have no updates-disabled msi"
         export SHOULD_BUILD="yes"
       else
@@ -171,6 +188,13 @@ elif [[ "${ASSETS}" != "null" ]]; then
         export SHOULD_BUILD_REH="no"
       fi
 
+      if [[ -z $( contains "${APP_NAME_LC}-reh-web-win32-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" ) ]]; then
+        echo "Building on Windows ia32 because we have no REH-web archive"
+        export SHOULD_BUILD="yes"
+      else
+        export SHOULD_BUILD_REH_WEB="no"
+      fi
+
       if [[ "${SHOULD_BUILD}" != "yes" ]]; then
         echo "Already have all the Windows ia32 builds"
       fi
@@ -198,14 +222,18 @@ elif [[ "${ASSETS}" != "null" ]]; then
         export SHOULD_BUILD_ZIP="no"
       fi
 
-      if [[ -z $( contains "${APP_NAME}-${VSCODE_ARCH}-${RELEASE_VERSION}.msi" ) ]]; then
+      if [[ "${DISABLE_MSI}" == "yes" ]]; then
+          export SHOULD_BUILD_MSI="no"
+      elif [[ -z $( contains "${APP_NAME}-${VSCODE_ARCH}-${RELEASE_VERSION}.msi" ) ]]; then
         echo "Building on Windows x64 because we have no msi"
         export SHOULD_BUILD="yes"
       else
         export SHOULD_BUILD_MSI="no"
       fi
 
-      if [[ -z $( contains "${APP_NAME}-${VSCODE_ARCH}-updates-disabled-${RELEASE_VERSION}.msi" ) ]]; then
+      if [[ "${DISABLE_MSI}" == "yes" ]]; then
+          export SHOULD_BUILD_MSI_NOUP="no"
+      elif [[ -z $( contains "${APP_NAME}-${VSCODE_ARCH}-updates-disabled-${RELEASE_VERSION}.msi" ) ]]; then
         echo "Building on Windows x64 because we have no updates-disabled msi"
         export SHOULD_BUILD="yes"
       else
@@ -219,6 +247,13 @@ elif [[ "${ASSETS}" != "null" ]]; then
         export SHOULD_BUILD_REH="no"
       fi
 
+      if [[ -z $( contains "${APP_NAME_LC}-reh-web-win32-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" ) ]]; then
+        echo "Building on Windows x64 because we have no REH-web archive"
+        export SHOULD_BUILD="yes"
+      else
+        export SHOULD_BUILD_REH_WEB="no"
+      fi
+
       if [[ "${SHOULD_BUILD}" != "yes" ]]; then
         echo "Already have all the Windows x64 builds"
       fi
@@ -226,6 +261,7 @@ elif [[ "${ASSETS}" != "null" ]]; then
   elif [[ "${OS_NAME}" == "linux" ]]; then
 
     if [[ "${CHECK_ONLY_REH}" == "yes" ]]; then
+
       if [[ -z $( contains "${APP_NAME_LC}-reh-linux-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" ) ]]; then
         echo "Building on Linux ${VSCODE_ARCH} because we have no REH archive"
         export SHOULD_BUILD="yes"
@@ -233,6 +269,15 @@ elif [[ "${ASSETS}" != "null" ]]; then
         echo "Already have the Linux REH ${VSCODE_ARCH} archive"
         export SHOULD_BUILD_REH="no"
       fi
+
+      if [[ -z $( contains "${APP_NAME_LC}-reh-web-linux-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" ) ]]; then
+        echo "Building on Linux ${VSCODE_ARCH} because we have no REH-web archive"
+        export SHOULD_BUILD="yes"
+      else
+        echo "Already have the Linux REH-web ${VSCODE_ARCH} archive"
+        export SHOULD_BUILD_REH_WEB="no"
+      fi
+
     else
 
       # linux-arm64
@@ -265,6 +310,13 @@ elif [[ "${ASSETS}" != "null" ]]; then
           export SHOULD_BUILD_REH="no"
         fi
 
+        if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-web-linux-arm64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+          echo "Building on Linux arm64 because we have no REH-web archive"
+          export SHOULD_BUILD="yes"
+        else
+          export SHOULD_BUILD_REH_WEB="no"
+        fi
+
         export SHOULD_BUILD_APPIMAGE="no"
 
         if [[ "${SHOULD_BUILD}" != "yes" ]]; then
@@ -302,6 +354,13 @@ elif [[ "${ASSETS}" != "null" ]]; then
           export SHOULD_BUILD_REH="no"
         fi
 
+        if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-web-linux-armhf-${RELEASE_VERSION}.tar.gz" ) ]]; then
+          echo "Building on Linux arm because we have no REH-web archive"
+          export SHOULD_BUILD="yes"
+        else
+          export SHOULD_BUILD_REH_WEB="no"
+        fi
+
         export SHOULD_BUILD_APPIMAGE="no"
 
         if [[ "${SHOULD_BUILD}" != "yes" ]]; then
@@ -314,7 +373,14 @@ elif [[ "${ASSETS}" != "null" ]]; then
         SHOULD_BUILD_APPIMAGE="no"
         SHOULD_BUILD_DEB="no"
         SHOULD_BUILD_RPM="no"
-        SHOULD_BUILD_TAR="no"
+
+        if [[ -z $( contains "${APP_NAME}-linux-ppc64le-${RELEASE_VERSION}.tar.gz" ) ]]; then
+          echo "Building on Linux PowerPC64LE because we have no TAR"
+          export SHOULD_BUILD="yes"
+        else
+          export SHOULD_BUILD_TAR="no"
+        fi
+
 
         if [[ -z $( contains "${APP_NAME_LC}-reh-linux-ppc64le-${RELEASE_VERSION}.tar.gz" ) ]]; then
           echo "Building on Linux PowerPC64LE because we have no REH archive"
@@ -323,6 +389,13 @@ elif [[ "${ASSETS}" != "null" ]]; then
           export SHOULD_BUILD_REH="no"
         fi
 
+        if [[ -z $( contains "${APP_NAME_LC}-reh-web-linux-ppc64le-${RELEASE_VERSION}.tar.gz" ) ]]; then
+          echo "Building on Linux PowerPC64LE because we have no REH-web archive"
+          export SHOULD_BUILD="yes"
+        else
+          export SHOULD_BUILD_REH_WEB="no"
+        fi
+
         if [[ "${SHOULD_BUILD}" != "yes" ]]; then
           echo "Already have all the Linux PowerPC64LE builds"
         fi
@@ -330,20 +403,91 @@ elif [[ "${ASSETS}" != "null" ]]; then
 
       # linux-riscv64
       if [[ "${VSCODE_ARCH}" == "riscv64" || "${CHECK_ALL}" == "yes" ]]; then
-        SHOULD_BUILD_APPIMAGE="no"
-        SHOULD_BUILD_DEB="no"
-        SHOULD_BUILD_RPM="no"
-        SHOULD_BUILD_TAR="no"
+        export SHOULD_BUILD_DEB="no"
+        export SHOULD_BUILD_RPM="no"
+        export SHOULD_BUILD_APPIMAGE="no"
+
+        if [[ -z $( contains "${APP_NAME}-linux-riscv64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+          echo "Building on Linux RISC-V 64 because we have no TAR"
+          export SHOULD_BUILD="yes"
+        else
+          export SHOULD_BUILD_TAR="no"
+        fi
 
         if [[ -z $( contains "${APP_NAME_LC}-reh-linux-riscv64-${RELEASE_VERSION}.tar.gz" ) ]]; then
-          echo "Building on Linux RISC-V64 because we have no REH archive"
+          echo "Building on Linux RISC-V 64 because we have no REH archive"
           export SHOULD_BUILD="yes"
         else
           export SHOULD_BUILD_REH="no"
         fi
 
+        if [[ -z $( contains "${APP_NAME_LC}-reh-web-linux-riscv64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+          echo "Building on Linux RISC-V 64 because we have no REH-web archive"
+          export SHOULD_BUILD="yes"
+        else
+          export SHOULD_BUILD_REH_WEB="no"
+        fi
+
         if [[ "${SHOULD_BUILD}" != "yes" ]]; then
-          echo "Already have all the Linux PowerPC64LE builds"
+          echo "Already have all the Linux riscv64 builds"
+        fi
+      fi
+
+      # linux-loong64
+      if [[ "${VSCODE_ARCH}" == "loong64" || "${CHECK_ALL}" == "yes" ]]; then
+        export SHOULD_BUILD_DEB="no"
+        export SHOULD_BUILD_RPM="no"
+        export SHOULD_BUILD_APPIMAGE="no"
+
+        if [[ -z $( contains "${APP_NAME}-linux-loong64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+          echo "Building on Linux Loong64 because we have no TAR"
+          export SHOULD_BUILD="yes"
+        else
+          export SHOULD_BUILD_TAR="no"
+        fi
+
+        if [[ -z $( contains "${APP_NAME_LC}-reh-linux-loong64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+          echo "Building on Linux Loong64 because we have no REH archive"
+          export SHOULD_BUILD="yes"
+        else
+          export SHOULD_BUILD_REH="no"
+        fi
+
+        if [[ -z $( contains "${APP_NAME_LC}-reh-web-linux-loong64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+          echo "Building on Linux Loong64 because we have no REH-web archive"
+          export SHOULD_BUILD="yes"
+        else
+          export SHOULD_BUILD_REH_WEB="no"
+        fi
+
+        if [[ "${SHOULD_BUILD}" != "yes" ]]; then
+          echo "Already have all the Linux Loong64 builds"
+        fi
+      fi
+
+      # linux-s390x
+      if [[ "${VSCODE_ARCH}" == "s390x" || "${CHECK_ALL}" == "yes" ]]; then
+        SHOULD_BUILD_APPIMAGE="no"
+        SHOULD_BUILD_DEB="no"
+        SHOULD_BUILD_RPM="no"
+        SHOULD_BUILD_TAR="no"
+
+        if [[ -z $( contains "${APP_NAME_LC}-reh-linux-s390x-${RELEASE_VERSION}.tar.gz" ) ]]; then
+          echo "Building on Linux s390x because we have no REH archive"
+          export SHOULD_BUILD="yes"
+        else
+          export SHOULD_BUILD_REH="no"
+        fi
+
+        if [[ -z $( contains "${APP_NAME_LC}-reh-web-linux-s390x-${RELEASE_VERSION}.tar.gz" ) ]]; then
+          echo "Building on Linux s390x because we have no REH-web archive"
+          export SHOULD_BUILD="yes"
+        else
+          export SHOULD_BUILD_REH_WEB="no"
+        fi
+
+        if [[ "${SHOULD_BUILD}" != "yes" ]]; then
+          echo "Already have all the Linux s390x builds"
         fi
       fi
 
@@ -370,7 +514,9 @@ elif [[ "${ASSETS}" != "null" ]]; then
           export SHOULD_BUILD_TAR="no"
         fi
 
-        if [[ -z $( contains "x86_64.AppImage" ) ]]; then
+        if [[ "${DISABLE_APPIMAGE}" == "yes" ]]; then
+          export SHOULD_BUILD_APPIMAGE="no"
+        elif [[ -z $( contains "x86_64.AppImage" ) ]]; then
           echo "Building on Linux x64 because we have no AppImage"
           export SHOULD_BUILD="yes"
         else
@@ -384,27 +530,100 @@ elif [[ "${ASSETS}" != "null" ]]; then
           export SHOULD_BUILD_REH="no"
         fi
 
+        if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-web-linux-x64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+          echo "Building on Linux x64 because we have no REH-web archive"
+          export SHOULD_BUILD="yes"
+        else
+          export SHOULD_BUILD_REH_WEB="no"
+        fi
+
         if [[ "${SHOULD_BUILD}" != "yes" ]]; then
           echo "Already have all the Linux x64 builds"
         fi
       fi
     fi
+
+  elif [[ "${OS_NAME}" == "alpine" ]]; then
+
+    if [[ "${CHECK_ONLY_REH}" == "yes" ]]; then
+      if [[ -z $( contains "${APP_NAME_LC}-reh-alpine-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" ) ]]; then
+        echo "Building on Alpine ${VSCODE_ARCH} because we have no REH archive"
+        export SHOULD_BUILD="yes"
+      else
+        echo "Already have the Alpine REH ${VSCODE_ARCH} archive"
+        export SHOULD_BUILD_REH="no"
+      fi
+
+      if [[ -z $( contains "${APP_NAME_LC}-reh-web-alpine-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" ) ]]; then
+        echo "Building on Alpine ${VSCODE_ARCH} because we have no REH-web archive"
+        export SHOULD_BUILD="yes"
+      else
+        echo "Already have the Alpine REH-web ${VSCODE_ARCH} archive"
+        export SHOULD_BUILD_REH_WEB="no"
+      fi
+    else
+
+      # alpine-arm64
+      if [[ "${VSCODE_ARCH}" == "arm64" || "${CHECK_ALL}" == "yes" ]]; then
+        if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-alpine-arm64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+          echo "Building on Alpine arm64 because we have no REH archive"
+          export SHOULD_BUILD="yes"
+        else
+          export SHOULD_BUILD_REH="no"
+        fi
+
+         if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-web-alpine-arm64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+          echo "Building on Alpine arm64 because we have no REH-web archive"
+          export SHOULD_BUILD="yes"
+        else
+          export SHOULD_BUILD_REH_WEB="no"
+        fi
+      fi
+
+      # alpine-x64
+      if [[ "${VSCODE_ARCH}" == "x64" || "${CHECK_ALL}" == "yes" ]]; then
+        if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-alpine-x64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+          echo "Building on Alpine x64 because we have no REH archive"
+          export SHOULD_BUILD="yes"
+        else
+          export SHOULD_BUILD_REH="no"
+        fi
+
+        if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-web-alpine-x64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+          echo "Building on Alpine x64 because we have no REH-web archive"
+          export SHOULD_BUILD="yes"
+        else
+          export SHOULD_BUILD_REH_WEB="no"
+        fi
+      fi
+    fi
   fi
 else
   if [[ "${IS_SPEARHEAD}" == "yes" ]]; then
     export SHOULD_BUILD_SRC="yes"
   elif [[ "${OS_NAME}" == "linux" ]]; then
-    if [[ "${VSCODE_ARCH}" == "ppc64le" || "${VSCODE_ARCH}" == "riscv64" ]]; then
+    if [[ "${VSCODE_ARCH}" == "ppc64le" ]]; then
       SHOULD_BUILD_DEB="no"
       SHOULD_BUILD_RPM="no"
       SHOULD_BUILD_TAR="no"
+    elif [[ "${VSCODE_ARCH}" == "riscv64" ]]; then
+      SHOULD_BUILD_DEB="no"
+      SHOULD_BUILD_RPM="no"
+    elif [[ "${VSCODE_ARCH}" == "loong64" ]]; then
+      SHOULD_BUILD_DEB="no"
+      SHOULD_BUILD_RPM="no"
     fi
-    if [[ "${VSCODE_ARCH}" != "x64" ]]; then
+    if [[ "${VSCODE_ARCH}" != "x64" || "${DISABLE_APPIMAGE}" == "yes" ]]; then
       export SHOULD_BUILD_APPIMAGE="no"
     fi
   elif [[ "${OS_NAME}" == "windows" ]]; then
     if [[ "${VSCODE_ARCH}" == "arm64" ]]; then
       export SHOULD_BUILD_REH="no"
+      export SHOULD_BUILD_REH_WEB="no"
+    fi
+    if [[ "${DISABLE_MSI}" == "yes" ]]; then
+      export SHOULD_BUILD_MSI="no"
+      export SHOULD_BUILD_MSI_NOUP="no"
     fi
   fi
 
@@ -422,6 +641,7 @@ echo "SHOULD_BUILD_EXE_USR=${SHOULD_BUILD_EXE_USR}" >> "${GITHUB_ENV}"
 echo "SHOULD_BUILD_MSI=${SHOULD_BUILD_MSI}" >> "${GITHUB_ENV}"
 echo "SHOULD_BUILD_MSI_NOUP=${SHOULD_BUILD_MSI_NOUP}" >> "${GITHUB_ENV}"
 echo "SHOULD_BUILD_REH=${SHOULD_BUILD_REH}" >> "${GITHUB_ENV}"
+echo "SHOULD_BUILD_REH_WEB=${SHOULD_BUILD_REH_WEB}" >> "${GITHUB_ENV}"
 echo "SHOULD_BUILD_RPM=${SHOULD_BUILD_RPM}" >> "${GITHUB_ENV}"
 echo "SHOULD_BUILD_TAR=${SHOULD_BUILD_TAR}" >> "${GITHUB_ENV}"
 echo "SHOULD_BUILD_ZIP=${SHOULD_BUILD_ZIP}" >> "${GITHUB_ENV}"

docs/extensions-compatibility.md

@@ -26,3 +26,4 @@ The following extensions are functional replacements for incompatible extensions
 
 - [Open Remote - SSH](https://open-vsx.org/extension/jeanp413/open-remote-ssh)
 - [Open Remote - WSL](https://open-vsx.org/extension/jeanp413/open-remote-wsl)
+- [BasedPyright](https://open-vsx.org/extension/detachhead/basedpyright) (open-source alternative to Pylance)

docs/howto-build.md

@@ -7,9 +7,6 @@
   - [MacOS](#dependencies-macos)
   - [Windows](#dependencies-windows)
 - [Build Scripts](#build-scripts)
-- [Build in Docker](#build-docker)
-  - [X64](#build-docker-x64)
-  - [ARM 32bits](#build-docker-arm32)
 - [Build Snap](#build-snap)
 - [Patch Update Process](#patch-update-process)
   - [Semi-Automated](#patch-update-process-semiauto)
@@ -17,7 +14,7 @@
 
 ## <a id="dependencies"></a>Dependencies
 
-- node 18.15
+- node 20.14
 - yarn
 - jq
 - git
@@ -76,49 +73,6 @@ The script `build/build.sh` provides several flags:
 - `-p`: generate the packages/assets/installers
 - `-s`: do not retrieve the source code of Visual Studio Code, it won't delete the existing build
 
-## <a id="build-docker"></a>Build in Docker
-
-To build for Linux, you can alternatively build VSCodium in docker
-
-### <a id="build-docker-x64"></a>X64
-
-Firstly, create the container with:
-```
-docker run -ti --volume=<local vscodium source>:/root/vscodium --name=vscodium-build-agent vscodium/vscodium-linux-build-agent:bionic-x64 bash
-```
-like
-```
-docker run -ti --volume=$(pwd):/root/vscodium --name=vscodium-build-agent vscodium/vscodium-linux-build-agent:bionic-x64 bash
-```
-
-When inside the container, you can use the following commands to build:
-```
-cd /root/vscodium
-
-./build/build.sh
-```
-
-### <a id="build-docker-arm32"></a>ARM 32bits
-
-Firstly, create the container with:
-```
-docker run -ti --volume=<local vscodium source>:/root/vscodium --name=vscodium-build-agent vscodium/vscodium-linux-build-agent:bionic-armhf bash
-```
-like
-```
-docker run -ti --volume=$(pwd):/root/vscodium --name=vscodium-build-agent vscodium/vscodium-linux-build-agent:bionic-armhf bash
-```
-
-When inside the container, you can use the following commands to build:
-```
-curl -fsSL https://deb.nodesource.com/setup_16.x | sudo -E bash -
-sudo apt-get install -y nodejs desktop-file-utils
-
-cd /root/vscodium
-
-./build/build.sh
-```
-
 ## <a id="build-snap"></a>Build Snap
 
 ```

docs/index.md

@@ -6,8 +6,9 @@
   - [Replacements to Microsoft Online Services](#replacement-online-services)
 - [Extensions + Marketplace](#extensions-marketplace)
   - [How to use the OpenVSX Marketplace](#howto-openvsx-marketplace)
-  - [How to use the VS Code Marketplace](#howto-vscode-marketplace)
+  - [How to use a different extension gallery](#howto-switch-marketplace)
   - [How to self host your own VS Code Marketplace](#howto-selfhost-marketplace)
+  - [Visual Studio Marketplace](#visual-studio-marketplace)
   - [Proprietary Debugging Tools](#proprietary-debugging-tools)
   - [Proprietary Extensions](#proprietary-extensions)
 - [Extensions compatibility](https://github.com/VSCodium/vscodium/blob/master/docs/extensions-compatibility.md)
@@ -27,9 +28,9 @@
 
 Even though we do not pass the telemetry build flags (and go out of our way to cripple the baked-in telemetry), Microsoft will still track usage by default.
 
-We do however set the default `telemetry.enableCrashReporter` and `telemetry.enableTelemetry` values to false. You can see those by viewing your VSCodium settings.json and searching for `telemetry`.
+We do however set the `telemetry.enableTelemetry` setting's default value to `false`. You can see those by viewing your VSCodium `settings.json` and searching for `telemetry`.
 
-The instructions [here](https://code.visualstudio.com/docs/supporting/faq#_how-to-disable-telemetry-reporting) and [here](https://code.visualstudio.com/docs/supporting/faq#_how-to-disable-crash-reporting) help with explaining and toggling telemetry.
+The instructions [here](https://code.visualstudio.com/docs/supporting/faq#_how-to-disable-telemetry-reporting) help with explaining and toggling telemetry.
 
 It is also highly recommended that you review all the settings that "use online services" by following [these instructions](https://code.visualstudio.com/docs/getstarted/telemetry#_managing-online-services). The `@tag:usesOnlineServices` filter on the settings page will show that by default:
 
@@ -66,29 +67,26 @@ See [this article](https://www.gitpod.io/blog/open-vsx/) for more information on
 ### <a id="howto-switch-marketplace"></a>How to use a different extension gallery
 
 You can switch from the pre-set Open VSX Registry by configuring the endpoints using the following solutions.
-These examples use the URLs for Microsoft's VS Code Marketplace, see [below](#howto-vscode-marketplace) for more information on that.
 
-With the following environment variables:
-- `VSCODE_GALLERY_SERVICE_URL='https://marketplace.visualstudio.com/_apis/public/gallery'`
-- `VSCODE_GALLERY_ITEM_URL='https://marketplace.visualstudio.com/items'`
-- `VSCODE_GALLERY_CACHE_URL='https://vscode.blob.core.windows.net/gallery/index'`
-- `VSCODE_GALLERY_CONTROL_URL=''`
+You can either use the following environment variables:
+- `VSCODE_GALLERY_SERVICE_URL`
+- `VSCODE_GALLERY_ITEM_URL`
+- `VSCODE_GALLERY_CACHE_URL`
+- `VSCODE_GALLERY_CONTROL_URL`
 
 Or by creating a custom `product.json` at the following location (replace `VSCodium` by `VSCodium - Insiders` if you use that):
 - Windows: `%APPDATA%\VSCodium` or `%USERPROFILE%\AppData\Roaming\VSCodium`
 - macOS: `~/Library/Application Support/VSCodium`
 - Linux: `$XDG_CONFIG_HOME/VSCodium` or `~/.config/VSCodium`
 
-with the content:
-
-- Note: set `cacheUrl` to empty string for every other extension gallery
+with the content like:
 
 ```jsonc
 {
   "extensionsGallery": {
-    "serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery",
-    "itemUrl": "https://marketplace.visualstudio.com/items",
-    "cacheUrl": "https://vscode.blob.core.windows.net/gallery/index",
+    "serviceUrl": "",
+    "itemUrl": "",
+    "cacheUrl": "",
     "controlUrl": ""
   }
 }
@@ -96,7 +94,7 @@ with the content:
 
 ### <a id="howto-selfhost-marketplace"></a>How to self-host your own extension gallery
 
-Individual developers and enterprise companies in regulated or security-conscious industries can self-host their own extension gallery. In all of these cases, you'd enter its endpoint URLs as noted above, replacing `marketplace.visualstudio.com` with `your-self-hosted-marketplace-address.example.com` (or IP address), setting `cacheUrl` / `VSCODE_GALLERY_CACHE_URL` to an empty string.
+Individual developers and enterprise companies in regulated or security-conscious industries can self-host their own extension gallery.
 
 There are likely other options, but the following were reported to work:
 
@@ -109,14 +107,15 @@ There are likely other options, but the following were reported to work:
 
     > `code-marketplace` is a self-contained go binary that does not have a frontend or any mechanisms for extension authors to add or update extensions in the marketplace. It simply reads extensions from file storage and provides an API for VSCode compatible editors to consume.
 
-### <a id="howto-vscode-marketplace"></a>How to use the VS Code Marketplace
+### <a id="visual-studio-marketplace"></a>Visual Studio Marketplace
+
+As with any online service, ensure you've understood [its terms of use](https://aka.ms/vsmarketplace-ToU) which include:
+> Marketplace Offerings are intended for use only with Visual Studio Products and Services and you may only install and use Marketplace Offerings with Visual Studio Products and Services.
+
+So, we can't provide any help if you intend to infringe their terms of use.
 
-As with any online service, ensure you've understood [its terms of use](https://aka.ms/vsmarketplace-ToU).
 Also note that this extension gallery hosts multiple extensions that are non-free and have license-agreements that explicitly forbid using them in non-Microsoft products, along with using telemetry.
 
-The endpoint URLs are given in the [example above](#howto-switch-marketplace).
-
-
 ### <a id="proprietary-debugging-tools"></a>Proprietary Debugging Tools
 
 The debugger provided with Microsoft's [C# extension](https://github.com/OmniSharp/omnisharp-vscode) as well as the (Windows) debugger provided with their [C++ extension](https://github.com/Microsoft/vscode-cpptools) are very restrictively licensed to only work with the official Visual Studio Code build. See [this comment in the C# extension repo](https://github.com/OmniSharp/omnisharp-vscode/issues/2491#issuecomment-418811364) and [this comment in the C++ extension repo](https://github.com/Microsoft/vscode-cpptools/issues/21#issuecomment-248349017).

docs/troubleshooting.md

@@ -4,8 +4,10 @@
 
 - [Linux](#linux)
   - [Fonts showing up as rectangles](#linux-fonts-rectangle)
+  - [Text and/or the entire interface not appearing](#linux-rendering-glitches)
   - [Global menu workaround for KDE](#linux-kde-global-menu)
   - [Flatpak most common issues](#linux-flatpak-most-common-issues)
+  - [Remote SSH doesn't work](#linux-remote-ssh)
 - [macOS](#macos)
   - [App can't be opened because Apple cannot check it for malicious software](#macos-unidentified-developer)
   - ["VSCodium.app" is damaged and can’t be opened. You should move it to the Bin](#macos-quarantine)
@@ -23,6 +25,14 @@ rm -rf ~/snap/codium/common/.cache
 fc-cache -r
 ```
 
+#### <a id="linux-rendering-glitches"></a>*Text and/or the entire interface not appearing*
+
+You have likely encountered [a bug in Chromium and Electron](microsoft/vscode#190437) when compiling Mesa shaders, which has affected all Visual Studio Code and VSCodium versions for Linux distributions since 1.82.  The current workaround (see microsoft/vscode#190437) is to delete the GPU cache as follows:
+
+```bash
+rm -rf ~/.config/VSCodium/GPUCache
+```
+
 #### <a id="linux-kde-global-menu"></a>*Global menu workaround for KDE*
 
 Install these packages on Fedora:
@@ -55,6 +65,14 @@ Credits: [Gerson](https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo/-/issues/
 
 - If you have any other problems with the flatpak package try to look on the [FAQ](https://github.com/flathub/com.vscodium.codium?tab=readme-ov-file#faq) maybe the solution is already there or open an [issue](https://github.com/flathub/com.vscodium.codium/issues).
 
+##### <a id="linux-remote-ssh"></a>*Remote SSH doesn't work*
+
+Use the VSCodium's compatible extension [Open Remote - SSH](https://open-vsx.org/extension/jeanp413/open-remote-ssh).
+
+On the server, in the `sshd` config, `AllowTcpForwarding` need to be set to `yes`.
+
+It might requires additional dependeincies due to the OS/distro (alpine).
+
 ## <a id="macos"></a>macOS
 
 Since the App is signed with a self-signed certificate, on the first launch, you might see the following messages:

electron_linux_loong64.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+export ELECTRON_VERSION="32.2.7"
+export VSCODE_ELECTRON_TAG="v${ELECTRON_VERSION}"

electron_linux_loong64.sha256sums

@@ -0,0 +1,11 @@
+2324198f130de1f5ccff6f216277eafa76fa53883c8297533f0e0c09d96faf31 *chromedriver-v32.2.7-linux-loong64.zip
+724acd5cde9e747b3765f062b9a243af344faa039f9f0218beed1b0e9455e893 *electron-v32.2.7-linux-loong64-debug.zip
+dee3600a67cc7f40f0fb4a8938940cb20fba0a95886352145cacc0334baa955e *electron-v32.2.7-linux-loong64-symbols.zip
+2904bfaa386deddf968dec71c4b4235635daa318bdbb05ae3f3673983242cefe *electron-v32.2.7-linux-loong64.zip
+e8fb755c82a58d98c70c1d3ac4d9c9c77e42021322b188183a550793ba94afe0 *ffmpeg-v32.2.7-linux-loong64.zip
+69506c95a7ce4d5270164e0613aec9eb11fdc24f3dc21df3cd78963b764a6b75 *hunspell-dictionaries.zip
+e02189a00e5170306289ba2bc0c295a9698f76899d812e35fc69fd8e4e4841d2 *libcxx-headers.zip
+0cc5c76d848d9f572ef4050839876afd8533dc71fc90c319edfffcaa3dca0e01 *libcxx-objects-v32.2.7-linux-loong64.zip
+caada8fb0a210d660e2150a0fe9f7b84a9e969a5b1110ce2d6b58f5d21637387 *libcxxabi-headers.zip
+8736592799acdaafae2214156c7755f3249f4fd577fccc3df11bf42a5481aa12 *mksnapshot-v32.2.7-linux-loong64.zip
+3d80771ab908f55cc61416b8b11d572e777b6c613ad2a7ee7aa8fef8b4ede011 *node-v32.2.7-headers.tar.gz

electron_linux_ppc64le.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+export ELECTRON_VERSION="32.2.7"
+export VSCODE_ELECTRON_TAG="v${ELECTRON_VERSION}"

electron_linux_ppc64le.sha256sums

@@ -0,0 +1,11 @@
+176cbd410925566ed2290d006b4a70de9d7953997d2189e67495fec5ec7648aa *chromedriver-v32.2.7-linux-ppc64le.zip
+64a683d339b87463cacef142730ac366fa39ee27e017390909a928b9afb81b12 *electron-v32.2.7-linux-ppc64le-debug.zip
+361b11b83589f64756def0a4982b611fb5220df287cd6c6fc3c9d4c5240a7b87 *electron-v32.2.7-linux-ppc64le-symbols.zip
+1cba399c82c5baccb0387971a5697920d771bc424bd65fe503289e4d8f72dfa2 *electron-v32.2.7-linux-ppc64le.zip
+ce41b10c28bd43249cd3b409e081b1c83a2b691381bdd2e3bf208ec40ca176b8 *electron.d.ts
+9b74c159cbc8e9f80d145117e828066b09a1703961adc4f31703271776132797 *ffmpeg-v32.2.7-linux-ppc64le.zip
+d8b47b51bb9474e39f9a0024a34a2378e4bdb3ff1ed4366db1752b3c6452afd1 *hunspell_dictionaries.zip
+0c125463ff1b1bc3e8f16e3fc09052f4061143743acddf478188d08049da4d55 *libcxx-objects-v32.2.7-linux-ppc64le.zip
+b1fc26b925ba6b896dea50bd471128cfa290c5b19673a62e8775537f6f94514d *libcxx_headers.zip
+6f00ab500f9418eb788578c67a84422ed5dc962ad9c3be0de1f2931f55066895 *libcxxabi_headers.zip
+2def4b7386e49bd658dd4f2f147710525423bb5cd3811394af0cf2b5047045ea *mksnapshot-v32.2.7-linux-ppc64le.zip

electron_linux_riscv64.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+export ELECTRON_VERSION="32.2.7"
+export VSCODE_ELECTRON_TAG="v${ELECTRON_VERSION}.riscv1"

electron_linux_riscv64.sha256sums

@@ -0,0 +1,11 @@
+26a3b6958d4b88f8b436b429aa7702d5d3af58ce892fe985c8fd68156e0b33d6 *chromedriver-v32.2.7-linux-riscv64.zip
+3b1e9b38a722a32c7127a9646b37366ebe20470fbedf17c94e2dd7e388046c26 *electron-v32.2.7-linux-riscv64-debug.tar.zst
+e9b4738bfd9aa0a9a98ee626e760f230730655bb02185a90a246ba6398c52db3 *electron-v32.2.7-linux-riscv64-symbols.tar.zst
+e71a432a4e03458b71d2428c812d3119658b61941a59b60d346d281b5c29f827 *electron-v32.2.7-linux-riscv64.zip
+51982b096a16b6546941710225fd21855a3fe3b83ec0bf69a4b048d9995ddd19 *ffmpeg-v32.2.7-linux-riscv64.zip
+5455ce9b9a98b349ad95050ca643bfc5312cf4636dd5ec62d475d1a07b2a35a5 *hunspell-dictionaries.zip
+4f0abd2517c30de0fc3ddcaa881460924b87c6a48e28cffa41e1050e201b17e5 *libcxx-headers.zip
+3477a9c568c8c65e5a142a2b4408aec19edda2de9ba303e4aec77eef41aeea10 *libcxx-objects-v32.2.7-linux-riscv64.zip
+01ff628652bc485ce6bf41b975e15339b246771f5f9d1de79ba24d79a00e840a *libcxxabi-headers.zip
+8d47b32d2cd3d57fab542de097a10f5f632a958902172a8993fe390a6089f778 *mksnapshot-v32.2.7-linux-riscv64.zip
+29229408ca301a90be7f7862ac3efec932b198105c44e668f1b3eb6bf043198e *node-v32.2.7-headers.tar.gz

get_pr.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+set -e
+
+# git workaround
+if [[ "${CI_BUILD}" != "no" ]]; then
+  git config --global --add safe.directory "/__w/$( echo "${GITHUB_REPOSITORY}" | awk '{print tolower($0)}' )"
+fi
+
+if [[ -n "${PULL_REQUEST_ID}" ]]; then
+  BRANCH_NAME=$( git rev-parse --abbrev-ref HEAD )
+
+  git config --global user.email "$( echo "${GITHUB_USERNAME}" | awk '{print tolower($0)}' )-ci@not-real.com"
+  git config --global user.name "${GITHUB_USERNAME} CI"
+  git fetch --unshallow
+  git fetch origin "pull/${PULL_REQUEST_ID}/head"
+  git checkout FETCH_HEAD
+  git merge --no-edit "origin/${BRANCH_NAME}"
+fi

get_repo.sh

@@ -8,17 +8,6 @@ if [[ "${CI_BUILD}" != "no" ]]; then
   git config --global --add safe.directory "/__w/$( echo "${GITHUB_REPOSITORY}" | awk '{print tolower($0)}' )"
 fi
 
-if [[ -n "${PULL_REQUEST_ID}" ]]; then
-  BRANCH_NAME=$( git rev-parse --abbrev-ref HEAD )
-
-  git config --global user.email "$( echo "${GITHUB_USERNAME}" | awk '{print tolower($0)}' )-ci@not-real.com"
-  git config --global user.name "${GITHUB_USERNAME} CI"
-  git fetch --unshallow
-  git fetch origin "pull/${PULL_REQUEST_ID}/head"
-  git checkout FETCH_HEAD
-  git merge --no-edit "origin/${BRANCH_NAME}"
-fi
-
 if [[ -z "${RELEASE_VERSION}" ]]; then
   if [[ "${VSCODE_LATEST}" == "yes" ]] || [[ ! -f "${VSCODE_QUALITY}.json" ]]; then
     echo "Retrieve lastest version"

include_osx.gypi

@@ -0,0 +1,11 @@
+{
+  'target_defaults': {
+    'conditions': [
+      ['OS=="mac"', {
+        'xcode_settings': {
+          'OTHER_CPLUSPLUSFLAGS': ['-std=c++20']
+        }
+      }]
+    ]
+  }
+}

insider.json

@@ -1,4 +1,4 @@
 {
-  "tag": "1.90.0",
-  "commit": "ca688da9fb6dad00996cee7d5342490daa7bb1fb"
+  "tag": "1.96.0",
+  "commit": "475acb4b9bdd77d4204224990bf288ed5bfe6b0e"
 }

install_gh.sh

@@ -4,9 +4,10 @@ set -ex
 
 GH_ARCH="amd64"
 
-VERSION=$( curl --retry 12 --retry-delay 30 "https://api.github.com/repos/cli/cli/releases/latest" | grep '"tag_name"' | sed -E 's/.*"([^"]+)".*/\1/' | cut -c2- )
+TAG=$( curl --retry 12 --retry-delay 30 "https://api.github.com/repos/cli/cli/releases/latest" | jq --raw-output '.tag_name' )
+VERSION=${TAG#v}
 
-curl --retry 12 --retry-delay 120 -sSL "https://github.com/cli/cli/releases/download/v${VERSION}/gh_${VERSION}_linux_${GH_ARCH}.tar.gz" -o "gh_${VERSION}_linux_${GH_ARCH}.tar.gz"
+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"
 

package_alpine_reh.sh

@@ -19,13 +19,25 @@ VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:a
 
 export VSCODE_HOST_MOUNT VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME
 
+if [[ -d "../patches/alpine/reh/" ]]; then
+  for file in "../patches/alpine/reh/"*.patch; do
+    if [[ -f "${file}" ]]; then
+      echo applying patch: "${file}";
+      if ! git apply --ignore-whitespace "${file}"; then
+        echo failed to apply patch "${file}" >&2
+        exit 1
+      fi
+    fi
+  done
+fi
+
 for i in {1..5}; do # try 5 times
-  yarn --frozen-lockfile --check-files && break
+  npm ci && break
   if [[ $i == 3 ]]; then
-    echo "Yarn failed too many times" >&2
+    echo "Npm install failed too many times" >&2
     exit 1
   fi
-  echo "Yarn failed $i, trying again..."
+  echo "Npm install failed $i, trying again..."
 done
 
 node build/azure-pipelines/distro/mixin-npm

package_linux_bin.sh

@@ -13,11 +13,55 @@ chown -R root:root vscode
 
 cd vscode || { echo "'vscode' dir not found"; exit 1; }
 
+export VSCODE_PLATFORM='linux'
 export VSCODE_SKIP_NODE_VERSION_CHECK=1
 export VSCODE_SYSROOT_PREFIX='-glibc-2.17'
 
-if [[ -d "../patches/${OS_NAME}/client/" ]]; then
-  for file in "../patches/${OS_NAME}/client/"*.patch; do
+if [[ "${VSCODE_ARCH}" == "arm64" || "${VSCODE_ARCH}" == "armhf" ]]; then
+  export VSCODE_SKIP_SYSROOT=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 VSCODE_SYSROOT_PREFIX='-glibc-2.28'
+  export USE_GNUPP2A=1
+  export ELECTRON_SKIP_BINARY_DOWNLOAD=1
+  export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
+  export VSCODE_SKIP_SETUPENV=1
+  export VSCODE_ELECTRON_REPOSITORY='lex-ibm/electron-ppc64le-build-scripts'
+elif [[ "${VSCODE_ARCH}" == "riscv64" ]]; then
+  export VSCODE_ELECTRON_REPOSITORY='riscv-forks/electron-riscv-releases'
+  export ELECTRON_SKIP_BINARY_DOWNLOAD=1
+  export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
+  export VSCODE_SKIP_SETUPENV=1
+elif [[ "${VSCODE_ARCH}" == "loong64" ]]; then
+  export VSCODE_ELECTRON_REPOSITORY='darkyzhou/electron-loong64'
+  export ELECTRON_SKIP_BINARY_DOWNLOAD=1
+  export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
+  export VSCODE_SKIP_SETUPENV=1
+fi
+
+if [[ -f "../electron_linux_${VSCODE_ARCH}.sh" ]]; then
+  # add newline at the end of the file
+  echo "" >> build/checksums/electron.txt
+
+  if [[ -f "../electron_linux_${VSCODE_ARCH}.sha256sums" ]]; then
+    cat "../electron_linux_${VSCODE_ARCH}.sha256sums" >> build/checksums/electron.txt
+  fi
+
+  # shellcheck disable=SC1090
+  source "../electron_linux_${VSCODE_ARCH}.sh"
+
+  if [[ "${ELECTRON_VERSION}" != "$( yarn config get target )" ]]; then
+    # Fail the pipeline if electron target doesn't match what is used.
+    echo "Electron ${VSCODE_ARCH} binary version doesn't match target electron version!"
+    echo "Releases available at: https://github.com/${VSCODE_ELECTRON_REPOSITORY}/releases"
+    exit 1
+  fi
+fi
+
+if [[ -d "../patches/linux/client/" ]]; then
+  for file in "../patches/linux/client/"*.patch; do
     if [[ -f "${file}" ]]; then
       echo applying patch: "${file}";
       if ! git apply --ignore-whitespace "${file}"; then
@@ -28,30 +72,62 @@ if [[ -d "../patches/${OS_NAME}/client/" ]]; then
   done
 fi
 
+if [[ -n "${USE_GNUPP2A}" ]]; then
+  INCLUDES=$(cat <<EOF
+{
+  "target_defaults": {
+    "conditions": [
+      ["OS=='linux'", {
+        'cflags_cc!': [ '-std=gnu++20' ],
+        'cflags_cc': [ '-std=gnu++2a' ],
+      }]
+    ]
+  }
+}
+EOF
+)
+
+  if [ ! -d "$HOME/.gyp" ]; then
+    mkdir -p "$HOME/.gyp"
+  fi
+
+  echo "${INCLUDES}" > "$HOME/.gyp/include.gypi"
+fi
+
 for i in {1..5}; do # try 5 times
-  yarn --cwd build --frozen-lockfile --check-files && break
+  npm ci --prefix build && break
   if [[ $i == 3 ]]; then
-    echo "Yarn failed too many times" >&2
+    echo "Npm install failed too many times" >&2
     exit 1
   fi
-  echo "Yarn failed $i, trying again..."
+  echo "Npm install failed $i, trying again..."
 done
 
-./build/azure-pipelines/linux/setup-env.sh
+if [[ -z "${VSCODE_SKIP_SETUPENV}" ]]; then
+  if [[ -n "${VSCODE_SKIP_SYSROOT}" ]]; then
+    source ./build/azure-pipelines/linux/setup-env.sh --skip-sysroot
+  else
+    source ./build/azure-pipelines/linux/setup-env.sh
+  fi
+fi
 
 for i in {1..5}; do # try 5 times
-  yarn --check-files && break
-  if [ $i -eq 3 ]; then
-    echo "Yarn failed too many times" >&2
+  npm ci && break
+  if [[ $i -eq 3 ]]; then
+    echo "Npm install failed too many times" >&2
     exit 1
   fi
-  echo "Yarn failed $i, trying again..."
+  echo "Npm install failed $i, trying again..."
 done
 
 node build/azure-pipelines/distro/mixin-npm
 
 yarn gulp "vscode-linux-${VSCODE_ARCH}-min-ci"
 
+if [[ -f "../ripgrep_${VSCODE_PLATFORM}_${VSCODE_ARCH}.sh" ]]; then
+  bash "../ripgrep_${VSCODE_PLATFORM}_${VSCODE_ARCH}.sh" "../VSCode-linux-${VSCODE_ARCH}/resources/app/node_modules"
+fi
+
 find "../VSCode-linux-${VSCODE_ARCH}" -print0 | xargs -0 touch -c
 
 cd ..

package_linux_reh.sh

@@ -7,13 +7,69 @@ if [[ "${CI_BUILD}" == "no" ]]; then
   exit 1
 fi
 
+APP_NAME_LC="$( echo "${APP_NAME}" | awk '{print tolower($0)}' )"
+
+mkdir -p assets
+
 tar -xzf ./vscode.tar.gz
 
 cd vscode || { echo "'vscode' dir not found"; exit 1; }
 
-GLIBC_VERSION="2.17"
-if [[ "${VSCODE_ARCH}" == "ppc64le" ]]; then
-  GLIBC_VERSION="2.28"
+GLIBC_VERSION="2.28"
+GLIBCXX_VERSION="3.4.26"
+NODE_VERSION="20.18.1"
+
+export VSCODE_NODEJS_URLROOT='/download/release'
+export VSCODE_NODEJS_URLSUFFIX=''
+
+if [[ "${VSCODE_ARCH}" == "x64" ]]; then
+  GLIBC_VERSION="2.17"
+  GLIBCXX_VERSION="3.4.22"
+  VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:centos7-devtoolset8-${VSCODE_ARCH}"
+
+  export VSCODE_NODEJS_SITE='https://unofficial-builds.nodejs.org'
+  export VSCODE_NODEJS_URLSUFFIX='-glibc-217'
+elif [[ "${VSCODE_ARCH}" == "arm64" ]]; then
+  VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:centos7-devtoolset8-${VSCODE_ARCH}"
+
+  export VSCODE_SKIP_SYSROOT=1
+  export USE_GNUPP2A=1
+elif [[ "${VSCODE_ARCH}" == "armhf" ]]; then
+  VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:bionic-devtoolset-arm32v7"
+
+  export VSCODE_SKIP_SYSROOT=1
+  export USE_GNUPP2A=1
+elif [[ "${VSCODE_ARCH}" == "ppc64le" ]]; then
+  VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:bionic-devtoolset-ppc64le"
+
+  export ELECTRON_SKIP_BINARY_DOWNLOAD=1
+  export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
+  export VSCODE_SYSROOT_REPOSITORY='VSCodium/vscode-linux-build-agent'
+  export VSCODE_SYSROOT_VERSION='20240129-253798'
+  export USE_GNUPP2A=1
+elif [[ "${VSCODE_ARCH}" == "riscv64" ]]; then
+  NODE_VERSION="20.16.0"
+  VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:focal-devtoolset-riscv64"
+
+  export ELECTRON_SKIP_BINARY_DOWNLOAD=1
+  export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
+  export VSCODE_SKIP_SETUPENV=1
+  export VSCODE_NODEJS_SITE='https://unofficial-builds.nodejs.org'
+elif [[ "${VSCODE_ARCH}" == "loong64" ]]; then
+  NODE_VERSION="20.16.0"
+  VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:trixie-devtoolset-loong64"
+
+  export ELECTRON_SKIP_BINARY_DOWNLOAD=1
+  export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
+  export VSCODE_SKIP_SETUPENV=1
+  export VSCODE_NODEJS_SITE='https://unofficial-builds.nodejs.org'
+elif [[ "${VSCODE_ARCH}" == "s390x" ]]; then
+  VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:focal-devtoolset-s390x"
+
+  export ELECTRON_SKIP_BINARY_DOWNLOAD=1
+  export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
+  export VSCODE_SYSROOT_REPOSITORY='VSCodium/vscode-linux-build-agent'
+  export VSCODE_SYSROOT_VERSION='20241108'
 fi
 
 export VSCODE_PLATFORM='linux'
@@ -23,67 +79,124 @@ export VSCODE_SYSROOT_PREFIX="-glibc-${GLIBC_VERSION}"
 VSCODE_HOST_MOUNT="$( pwd )"
 
 export VSCODE_HOST_MOUNT
-
-if [[ "${VSCODE_ARCH}" == "x64" || "${VSCODE_ARCH}" == "arm64" ]]; then
-  VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:centos7-devtoolset8-${VSCODE_ARCH}"
-elif [[ "${VSCODE_ARCH}" == "armhf" ]]; then
-  VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:bionic-devtoolset-arm32v7"
-elif [[ "${VSCODE_ARCH}" == "ppc64le" ]]; then
-  VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:bionic-devtoolset-ppc64le"
-  export ELECTRON_SKIP_BINARY_DOWNLOAD=1
-  export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
-elif [[ "${VSCODE_ARCH}" == "riscv64" ]]; then
-  VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:focal-devtoolset-riscv64"
-  export ELECTRON_SKIP_BINARY_DOWNLOAD=1
-  export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
-  # Unofficial RISC-V nodejs builds doesn't provide v16.x
-  sed -i '/target/s/"16.*"/"18.18.1"/' remote/.yarnrc
-fi
-
 export VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME
 
-for i in {1..5}; do # try 5 times
-  yarn --cwd build --frozen-lockfile --check-files && break
-  if [[ $i == 3 ]]; then
-    echo "Yarn failed too many times" >&2
-    exit 1
-  fi
-  echo "Yarn failed $i, trying again..."
-done
+sed -i "/target/s/\"20.*\"/\"${NODE_VERSION}\"/" remote/.npmrc
 
-if [[ "${VSCODE_ARCH}" == "ppc64le" ]]; then
-  source ./build/azure-pipelines/linux/setup-env.sh
-else
-  ./build/azure-pipelines/linux/setup-env.sh --only-remote
+if [[ -d "../patches/linux/reh/" ]]; then
+  for file in "../patches/linux/reh/"*.patch; do
+    if [[ -f "${file}" ]]; then
+      echo applying patch: "${file}";
+      if ! git apply --ignore-whitespace "${file}"; then
+        echo failed to apply patch "${file}" >&2
+        exit 1
+      fi
+    fi
+  done
+fi
+
+if [[ -d "../patches/linux/reh/${VSCODE_ARCH}/" ]]; then
+  for file in "../patches/linux/reh/${VSCODE_ARCH}/"*.patch; do
+    if [[ -f "${file}" ]]; then
+      echo applying patch: "${file}";
+      if ! git apply --ignore-whitespace "${file}"; then
+        echo failed to apply patch "${file}" >&2
+        exit 1
+      fi
+    fi
+  done
+fi
+
+if [[ -n "${USE_GNUPP2A}" ]]; then
+  INCLUDES=$(cat <<EOF
+{
+  "target_defaults": {
+    "conditions": [
+      ["OS=='linux'", {
+        'cflags_cc!': [ '-std=gnu++20' ],
+        'cflags_cc': [ '-std=gnu++2a' ],
+      }]
+    ]
+  }
+}
+EOF
+)
+
+  if [ ! -d "${HOME}/.gyp" ]; then
+    mkdir -p "${HOME}/.gyp"
+  fi
+
+  echo "${INCLUDES}" > "${HOME}/.gyp/include.gypi"
 fi
 
 for i in {1..5}; do # try 5 times
-  yarn --frozen-lockfile --check-files && break
-  if [ $i -eq 3 ]; then
-    echo "Yarn failed too many times" >&2
+  npm ci --prefix build && break
+  if [[ $i == 3 ]]; then
+    echo "Npm install failed too many times" >&2
     exit 1
   fi
-  echo "Yarn failed $i, trying again..."
+  echo "Npm install failed $i, trying again..."
 done
 
-EXPECTED_GLIBC_VERSION="${GLIBC_VERSION}" EXPECTED_GLIBCXX_VERSION="3.4.22" ./build/azure-pipelines/linux/verify-glibc-requirements.sh
+if [[ -z "${VSCODE_SKIP_SETUPENV}" ]]; then
+  if [[ -n "${VSCODE_SKIP_SYSROOT}" ]]; then
+    source ./build/azure-pipelines/linux/setup-env.sh --skip-sysroot
+  else
+    source ./build/azure-pipelines/linux/setup-env.sh
+  fi
+fi
+
+for i in {1..5}; do # try 5 times
+  npm ci && break
+  if [[ $i == 3 ]]; 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
 
 export VSCODE_NODE_GLIBC="-glibc-${GLIBC_VERSION}"
 
-yarn gulp minify-vscode-reh
-yarn gulp "vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}-min-ci"
+if [[ "${SHOULD_BUILD_REH}" != "no" ]]; then
+  echo "Building REH"
+  yarn gulp minify-vscode-reh
+  yarn gulp "vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}-min-ci"
 
-cd ..
+  EXPECTED_GLIBC_VERSION="${GLIBC_VERSION}" EXPECTED_GLIBCXX_VERSION="${GLIBCXX_VERSION}" SEARCH_PATH="../vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}" ./build/azure-pipelines/linux/verify-glibc-requirements.sh
 
-APP_NAME_LC="$( echo "${APP_NAME}" | awk '{print tolower($0)}' )"
+  pushd "../vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}"
 
-mkdir -p assets
+  if [[ -f "../ripgrep_${VSCODE_PLATFORM}_${VSCODE_ARCH}.sh" ]]; then
+    bash "../ripgrep_${VSCODE_PLATFORM}_${VSCODE_ARCH}.sh" "node_modules"
+  fi
+
+  echo "Archiving REH"
+  tar czf "../assets/${APP_NAME_LC}-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" .
+
+  popd
+fi
+
+if [[ "${SHOULD_BUILD_REH_WEB}" != "no" ]]; then
+  echo "Building REH-web"
+  yarn gulp minify-vscode-reh-web
+  yarn gulp "vscode-reh-web-${VSCODE_PLATFORM}-${VSCODE_ARCH}-min-ci"
+
+  EXPECTED_GLIBC_VERSION="${GLIBC_VERSION}" EXPECTED_GLIBCXX_VERSION="${GLIBCXX_VERSION}" SEARCH_PATH="../vscode-reh-web-${VSCODE_PLATFORM}-${VSCODE_ARCH}" ./build/azure-pipelines/linux/verify-glibc-requirements.sh
+
+  pushd "../vscode-reh-web-${VSCODE_PLATFORM}-${VSCODE_ARCH}"
+
+  if [[ -f "../ripgrep_${VSCODE_PLATFORM}_${VSCODE_ARCH}.sh" ]]; then
+    bash "../ripgrep_${VSCODE_PLATFORM}_${VSCODE_ARCH}.sh" "node_modules"
+  fi
+
+  echo "Archiving REH-web"
+  tar czf "../assets/${APP_NAME_LC}-reh-web-${VSCODE_PLATFORM}-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" .
+
+  popd
+fi
 
-echo "Building and moving REH"
-cd "vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}"
-tar czf "../assets/${APP_NAME_LC}-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" .
 cd ..
 
 npm install -g checksum

package_windows.sh

@@ -0,0 +1,43 @@
+#!/usr/bin/env bash
+# shellcheck disable=SC1091
+
+set -ex
+
+if [[ "${CI_BUILD}" == "no" ]]; then
+  exit 1
+fi
+
+tar -xzf ./vscode.tar.gz
+
+cd vscode || { echo "'vscode' dir not found"; exit 1; }
+
+for i in {1..5}; do # try 5 times
+  npm ci && break
+  if [[ $i -eq 3 ]]; 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
+
+. ../build/windows/rtf/make.sh
+
+yarn gulp "vscode-win32-${VSCODE_ARCH}-min-ci"
+
+if [[ "${VSCODE_ARCH}" == "x64" ]]; then
+  if [[ "${SHOULD_BUILD_REH}" != "no" ]]; then
+    echo "Building REH"
+    yarn gulp minify-vscode-reh
+    yarn gulp "vscode-reh-win32-${VSCODE_ARCH}-min-ci"
+  fi
+
+  if [[ "${SHOULD_BUILD_REH_WEB}" != "no" ]]; then
+    echo "Building REH-web"
+    yarn gulp minify-vscode-reh-web
+    yarn gulp "vscode-reh-web-win32-${VSCODE_ARCH}-min-ci"
+  fi
+fi
+
+cd ..

patch.sh

@@ -1,28 +1,51 @@
 #!/usr/bin/env bash
 
+set -e
+
+echo "$#"
+
+cd vscode || { echo "'vscode' dir not found"; exit 1; }
+
+git add .
+git reset -q --hard HEAD
+
+while [[ -n "$( git log -1 | grep "VSCODIUM HELPER" )" ]]; do
+  git reset -q --hard HEAD~
+done
+
+git apply --reject "../patches/helper/settings.patch"
+
+while [ $# -gt 1 ]; do
+  echo "Parameter: $1"
+  if [[ "${1}" == *patch ]]; then
+    FILE="../patches/${1}"
+  else
+    FILE="../patches/${1}.patch"
+  fi
+
+  git apply --reject "${FILE}"
+
+  shift
+done
+
+git add .
+git commit -q -m "VSCODIUM HELPER" --no-verify
+
 if [[ "${1}" == *patch ]]; then
   FILE="../patches/${1}"
 else
   FILE="../patches/${1}.patch"
 fi
 
-cd vscode || { echo "'vscode' dir not found"; exit 1; }
-
-git add .
-git reset -q --hard HEAD
-
 if [[ -f "${FILE}" ]]; then
   git apply --reject "${FILE}"
 fi
 
-git apply --reject "../patches/helper/settings.patch"
-
 read -rp "Press any key when the conflict have been resolved..." -n1 -s
 
-git restore .vscode/settings.json
-
 git add .
 git diff --staged -U1 > "${FILE}"
+git reset -q --hard HEAD~
 
 cd ..
 

patches/alpine/reh/fix-node-docker.patch

@@ -0,0 +1,23 @@
+diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
+index e12a33e..9300d62 100644
+--- a/build/gulpfile.reh.js
++++ b/build/gulpfile.reh.js
+@@ -188,5 +188,16 @@ function getNodeChecksum(expectedName) {
+ function extractAlpinefromDocker(nodeVersion, platform, arch) {
+-	const imageName = arch === 'arm64' ? 'arm64v8/node' : 'node';
++	let imageName = 'node';
++	let dockerPlatform = '';
++
++	if (arch === 'arm64') {
++		imageName = 'arm64v8/node';
++
++		const architecture = cp.execSync(`docker info --format '{{json .Architecture}}'`, { encoding: 'utf8' }).trim();
++		if (architecture != '"aarch64"') {
++			dockerPlatform = '--platform=linux/arm64';
++		}
++	}
++
+ 	log(`Downloading node.js ${nodeVersion} ${platform} ${arch} from docker image ${imageName}`);
+-	const contents = cp.execSync(`docker run --rm ${imageName}:${nodeVersion}-alpine /bin/sh -c 'cat \`which node\`'`, { maxBuffer: 100 * 1024 * 1024, encoding: 'buffer' });
++	const contents = cp.execSync(`docker run --rm ${dockerPlatform} ${imageName}:${nodeVersion}-alpine /bin/sh -c 'cat \`which node\`'`, { maxBuffer: 100 * 1024 * 1024, encoding: 'buffer' });
+ 	return es.readArray([new File({ path: 'node', contents, stat: { mode: parseInt('755', 8) } })]);

patches/crash-reporter.patch

@@ -1,13 +0,0 @@
-diff --git a/src/main.js b/src/main.js
-index 19dde20..d9611f2 100644
---- a/src/main.js
-+++ b/src/main.js
-@@ -409,6 +409,8 @@ function configureCrashReporter() {
- 					argv.splice(endOfArgsMarkerIndex, 0, '--crash-reporter-id', crashReporterId);
- 				}
- 			}
-+		} else {
-+			return;
- 		}
- 	}
- 

patches/disable-cloud.patch

@@ -1,22 +1,22 @@
 diff --git a/src/vs/workbench/contrib/editSessions/browser/editSessionsStorageService.ts b/src/vs/workbench/contrib/editSessions/browser/editSessionsStorageService.ts
-index 00914aa..d5cfc18 100644
+index 18b5815..51a5d50 100644
 --- a/src/vs/workbench/contrib/editSessions/browser/editSessionsStorageService.ts
 +++ b/src/vs/workbench/contrib/editSessions/browser/editSessionsStorageService.ts
-@@ -7,3 +7,3 @@ import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
- import { localize } from 'vs/nls';
--import { Action2, MenuId, MenuRegistry, registerAction2 } from 'vs/platform/actions/common/actions';
-+import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
- import { ContextKeyExpr, IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+@@ -7,3 +7,3 @@ import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.j
+ import { localize } from '../../../../nls.js';
+-import { Action2, MenuId, MenuRegistry, registerAction2 } from '../../../../platform/actions/common/actions.js';
++import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+ import { ContextKeyExpr, IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 @@ -17,3 +17,3 @@ import { AuthenticationSession, AuthenticationSessionsChangeEvent, IAuthenticati
- import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
--import { EDIT_SESSIONS_SIGNED_IN, EditSession, EDIT_SESSION_SYNC_CATEGORY, IEditSessionsStorageService, EDIT_SESSIONS_SIGNED_IN_KEY, IEditSessionsLogService, SyncResource, EDIT_SESSIONS_PENDING_KEY } from 'vs/workbench/contrib/editSessions/common/editSessions';
-+import { EDIT_SESSIONS_SIGNED_IN, EditSession, EDIT_SESSION_SYNC_CATEGORY, IEditSessionsStorageService, EDIT_SESSIONS_SIGNED_IN_KEY, IEditSessionsLogService, SyncResource } from 'vs/workbench/contrib/editSessions/common/editSessions';
- import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
+ import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+-import { EDIT_SESSIONS_SIGNED_IN, EditSession, EDIT_SESSION_SYNC_CATEGORY, IEditSessionsStorageService, EDIT_SESSIONS_SIGNED_IN_KEY, IEditSessionsLogService, SyncResource, EDIT_SESSIONS_PENDING_KEY } from '../common/editSessions.js';
++import { EDIT_SESSIONS_SIGNED_IN, EditSession, EDIT_SESSION_SYNC_CATEGORY, IEditSessionsStorageService, EDIT_SESSIONS_SIGNED_IN_KEY, IEditSessionsLogService, SyncResource } from '../common/editSessions.js';
+ import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
 @@ -93,3 +93,2 @@ export class EditSessionsWorkbenchService extends Disposable implements IEditSes
  
 -		this.registerSignInAction();
  		this.registerResetAuthenticationAction();
-@@ -455,39 +454,2 @@ export class EditSessionsWorkbenchService extends Disposable implements IEditSes
+@@ -456,39 +455,2 @@ export class EditSessionsWorkbenchService extends Disposable implements IEditSes
  
 -	private registerSignInAction() {
 -		const that = this;

patches/disable-signature-verification.patch

@@ -1,18 +1,14 @@
-diff --git a/src/vs/platform/extensionManagement/node/extensionDownloader.ts b/src/vs/platform/extensionManagement/node/extensionDownloader.ts
-index 0ddae28..2e3c9b2 100644
---- a/src/vs/platform/extensionManagement/node/extensionDownloader.ts
-+++ b/src/vs/platform/extensionManagement/node/extensionDownloader.ts
-@@ -11,3 +11,2 @@ import { joinPath } from 'vs/base/common/resources';
- import * as semver from 'vs/base/common/semver/semver';
--import { isBoolean } from 'vs/base/common/types';
- import { URI } from 'vs/base/common/uri';
-@@ -51,2 +50,3 @@ export class ExtensionsDownloader extends Disposable {
- 		@IExtensionGalleryService private readonly extensionGalleryService: IExtensionGalleryService,
+diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
+index 680e0dd..0b04279 100644
+--- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts
++++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
+@@ -86,2 +86,3 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
+ 		@IFileService private readonly fileService: IFileService,
 +		// @ts-expect-error no-unused-variable
  		@IConfigurationService private readonly configurationService: IConfigurationService,
-@@ -116,4 +116,3 @@ export class ExtensionsDownloader extends Disposable {
- 
--		const value = this.configurationService.getValue('extensions.verifySignature');
--		return isBoolean(value) ? value : true;
-+		return false;
- 	}
+@@ -347,4 +348,3 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
+ 		if (verifySignature) {
+-			const value = this.configurationService.getValue('extensions.verifySignature');
+-			verifySignature = isBoolean(value) ? value : true;
++			verifySignature = false;
+ 		}

patches/extensions-disable-mangler.patch

@@ -0,0 +1,11 @@
+--- vscode-1.80.1/extensions/mangle-loader.js.old	2023-07-12 18:45:52.000000000 +0200
++++ vscode-1.80.1/extensions/mangle-loader.js	2023-07-28 11:55:01.177444702 +0200
+@@ -37,7 +37,7 @@ function getMangledFileContents(projectP
+  * @type {webpack.LoaderDefinitionFunction}
+  */
+ module.exports = async function (source, sourceMap, meta) {
+-	if (this.mode !== 'production') {
++	if (true) {
+ 		// Only enable mangling in production builds
+ 		return source;
+ 	}

patches/feat-announcements.patch

@@ -1,8 +1,8 @@
 diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
-index 66b9062..0a659dc 100644
+index c581ac0..f11c0f0 100644
 --- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
 +++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
-@@ -315,2 +315,8 @@ configurationRegistry.registerConfiguration({
+@@ -319,2 +319,8 @@ configurationRegistry.registerConfiguration({
  		},
 +		'workbench.welcomePage.extraAnnouncements': {
 +			scope: ConfigurationScope.MACHINE,
@@ -12,10 +12,10 @@ index 66b9062..0a659dc 100644
 +		},
  		'workbench.startupEditor': {
 diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
-index a73549a..fc95016 100644
+index 664c55b..43f9e2e 100644
 --- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
 +++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
-@@ -115,4 +115,8 @@ type GettingStartedActionEvent = {
+@@ -113,4 +113,8 @@ type GettingStartedActionEvent = {
  type RecentEntry = (IRecentFolder | IRecentWorkspace) & { id: string };
 +type AnnouncementEntry = { id: string, title: string, url: string };
  
@@ -24,35 +24,26 @@ index a73549a..fc95016 100644
 +const BUILTIN_ANNOUNCEMENTS: AnnouncementEntry[] = [/* BUILTIN_ANNOUNCEMENTS */];
 +
  export class GettingStartedPage extends EditorPane {
-@@ -151,2 +155,4 @@ export class GettingStartedPage extends EditorPane {
+@@ -149,2 +153,4 @@ export class GettingStartedPage extends EditorPane {
  	private gettingStartedList?: GettingStartedIndexList<IResolvedWalkthrough>;
 +	private announcementList?: GettingStartedIndexList<AnnouncementEntry>;
 +	private announcementData?: AnnouncementEntry[];
- 	private videoList?: GettingStartedIndexList<IWelcomePageStartEntry>;
-@@ -844,2 +850,3 @@ export class GettingStartedPage extends EditorPane {
+ 
+@@ -812,2 +818,3 @@ export class GettingStartedPage extends EditorPane {
  		const gettingStartedList = this.buildGettingStartedWalkthroughsList();
 +		const announcementList = await this.buildAnnouncementList();
  
-@@ -856,6 +863,6 @@ export class GettingStartedPage extends EditorPane {
- 					this.container.classList.remove('noVideos');
--					reset(rightColumn, videoList?.getDomElement(), gettingStartedList.getDomElement());
-+					reset(rightColumn, videoList?.getDomElement(), gettingStartedList.getDomElement(), announcementList.getDomElement());
- 				} else {
- 					this.container.classList.add('noVideos');
--					reset(rightColumn, gettingStartedList.getDomElement());
-+					reset(rightColumn, gettingStartedList.getDomElement(), announcementList.getDomElement());
- 				}
-@@ -866,3 +873,3 @@ export class GettingStartedPage extends EditorPane {
- 					this.container.classList.remove('noVideos');
--					reset(rightColumn, videoList?.getDomElement());
-+					reset(rightColumn, videoList?.getDomElement(), announcementList.getDomElement());
- 				}
-@@ -870,3 +877,3 @@ export class GettingStartedPage extends EditorPane {
- 					this.container.classList.add('noVideos');
--					reset(rightColumn);
-+					reset(rightColumn, announcementList.getDomElement());
- 				}
-@@ -1023,2 +1030,55 @@ export class GettingStartedPage extends EditorPane {
+@@ -822,3 +829,3 @@ export class GettingStartedPage extends EditorPane {
+ 				this.container.classList.remove('noWalkthroughs');
+-				reset(rightColumn, gettingStartedList.getDomElement());
++				reset(rightColumn, gettingStartedList.getDomElement(), announcementList.getDomElement());
+ 			}
+@@ -826,3 +833,3 @@ export class GettingStartedPage extends EditorPane {
+ 				this.container.classList.add('noWalkthroughs');
+-				reset(rightColumn);
++				reset(rightColumn, announcementList.getDomElement());
+ 			}
+@@ -978,2 +985,55 @@ export class GettingStartedPage extends EditorPane {
  
 +	private async buildAnnouncementList(): Promise<GettingStartedIndexList<AnnouncementEntry>> {
 +		const renderAnnouncement = (announcement: AnnouncementEntry) => {

patches/fix-eol-banner.patch

@@ -1,15 +1,15 @@
 diff --git a/src/vs/workbench/browser/parts/banner/bannerPart.ts b/src/vs/workbench/browser/parts/banner/bannerPart.ts
-index dda7c88..e01f09e 100644
+index 1f329c4..3e36bff 100644
 --- a/src/vs/workbench/browser/parts/banner/bannerPart.ts
 +++ b/src/vs/workbench/browser/parts/banner/bannerPart.ts
-@@ -11,3 +11,3 @@ import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/
- import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
--import { IStorageService } from 'vs/platform/storage/common/storage';
-+import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
- import { IThemeService } from 'vs/platform/theme/common/themeService';
-@@ -30,2 +30,3 @@ import { widgetClose } from 'vs/platform/theme/common/iconRegistry';
- import { BannerFocused } from 'vs/workbench/common/contextkeys';
-+import { INeverShowAgainOptions, NeverShowAgainScope } from 'vs/platform/notification/common/notification';
+@@ -11,3 +11,3 @@ import { InstantiationType, registerSingleton } from '../../../../platform/insta
+ import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+-import { IStorageService } from '../../../../platform/storage/common/storage.js';
++import { IStorageService, StorageScope } from '../../../../platform/storage/common/storage.js';
+ import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+@@ -30,2 +30,3 @@ import { widgetClose } from '../../../../platform/theme/common/iconRegistry.js';
+ import { BannerFocused } from '../../../common/contextkeys.js';
++import { INeverShowAgainOptions, NeverShowAgainScope } from '../../../../platform/notification/common/notification';
  
 @@ -67,3 +68,3 @@ export class BannerPart extends Part implements IBannerService {
  		@IWorkbenchLayoutService layoutService: IWorkbenchLayoutService,
@@ -48,12 +48,12 @@ index dda7c88..e01f09e 100644
 +
  	toJSON(): object {
 diff --git a/src/vs/workbench/services/banner/browser/bannerService.ts b/src/vs/workbench/services/banner/browser/bannerService.ts
-index 9c1ab0d..688b1dc 100644
+index 2db0fa4..d179055 100644
 --- a/src/vs/workbench/services/banner/browser/bannerService.ts
 +++ b/src/vs/workbench/services/banner/browser/bannerService.ts
-@@ -10,2 +10,3 @@ import { ILinkDescriptor } from 'vs/platform/opener/browser/link';
- import { ThemeIcon } from 'vs/base/common/themables';
-+import { INeverShowAgainOptions } from 'vs/platform/notification/common/notification';
+@@ -10,2 +10,3 @@ import { ILinkDescriptor } from '../../../../platform/opener/browser/link.js';
+ import { ThemeIcon } from '../../../../base/common/themables.js';
++import { INeverShowAgainOptions } from '../../../../platform/notification/common/notification';
  
 @@ -18,2 +19,3 @@ export interface IBannerItem {
  	readonly onClose?: () => void;

patches/fix-remote-libs.patch

@@ -0,0 +1,25 @@
+diff --git a/remote/package-lock.json b/remote/package-lock.json
+index f0ed1cc..a973af3 100644
+--- a/remote/package-lock.json
++++ b/remote/package-lock.json
+@@ -40,2 +40,3 @@
+         "tas-client-umd": "0.2.0",
++        "tslib": "^2.6.3",
+         "vscode-oniguruma": "1.7.0",
+@@ -1109,2 +1110,8 @@
+     },
++    "node_modules/tslib": {
++      "version": "2.7.0",
++      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
++      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
++      "license": "0BSD"
++    },
+     "node_modules/tunnel-agent": {
+diff --git a/remote/package.json b/remote/package.json
+index 33afee9..525ed07 100644
+--- a/remote/package.json
++++ b/remote/package.json
+@@ -35,2 +35,3 @@
+     "tas-client-umd": "0.2.0",
++    "tslib": "^2.6.3",
+     "vscode-oniguruma": "1.7.0",

patches/helper/settings.patch

@@ -3,7 +3,7 @@ index 99e495a..996044a 100644
 --- a/.vscode/settings.json
 +++ b/.vscode/settings.json
 @@ -10,5 +10,5 @@
- 		"cli/target": true,
+ 		"build/**/*.js.map": true,
 -		"build/**/*.js": {
 -			"when": "$(basename).ts"
 -		}

patches/insider/add-remote-url.patch

@@ -1,18 +1,18 @@
 diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
-index 2a0c236..0f10f17 100644
+index 7d58861..cefb8ad 100644
 --- a/build/gulpfile.reh.js
 +++ b/build/gulpfile.reh.js
-@@ -256,3 +256,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
+@@ -306,3 +306,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
  		const productJsonStream = gulp.src(['product.json'], { base: '.' })
--			.pipe(json({ commit, date, version, release }));
-+			.pipe(json({ commit, date, version, release, serverDownloadUrlTemplate: 'https://github.com/VSCodium/vscodium-insiders/releases/download/${version}.${release}-insider/vscodium-reh-${os}-${arch}-${version}.${release}-insider.tar.gz' }));
- 
+-			.pipe(json({ commit, date: readISODate('out-build'), version, release }))
++			.pipe(json({ commit, date: readISODate('out-build'), version, release, serverDownloadUrlTemplate: 'https://github.com/VSCodium/vscodium-insiders/releases/download/${version}.${release}-insider/vscodium-reh-${os}-${arch}-${version}.${release}-insider.tar.gz' }))
+ 			.pipe(es.through(function (file) {
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index 0ca2cfd..9bf83a7 100644
+index 4af4067..1bac2cc 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -244,3 +244,3 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
- 		const date = new Date().toISOString();
--		const productJsonUpdate = { commit, date, checksums, version, release };
-+		const productJsonUpdate = { commit, date, checksums, version, release, serverDownloadUrlTemplate: 'https://github.com/VSCodium/vscodium-insiders/releases/download/${version}.${release}-insider/vscodium-reh-${os}-${arch}-${version}.${release}-insider.tar.gz' };
- 
+@@ -261,3 +261,3 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+ 		const productJsonStream = gulp.src(['product.json'], { base: '.' })
+-			.pipe(json({ commit, date: readISODate('out-build'), checksums, version, release }))
++			.pipe(json({ commit, date: readISODate('out-build'), checksums, version, release, serverDownloadUrlTemplate: 'https://github.com/VSCodium/vscodium-insiders/releases/download/${version}.${release}-insider/vscodium-reh-${os}-${arch}-${version}.${release}-insider.tar.gz' }))
+ 			.pipe(es.through(function (file) {

patches/linux/arch-0-support.patch

@@ -0,0 +1,116 @@
+diff --git a/build/azure-pipelines/linux/setup-env.sh b/build/azure-pipelines/linux/setup-env.sh
+index d836fb7..fbe67b0 100755
+--- a/build/azure-pipelines/linux/setup-env.sh
++++ b/build/azure-pipelines/linux/setup-env.sh
+@@ -2,3 +2,3 @@
+ 
+-set -e
++set -ex
+ 
+diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
+index 53ef6f3..d0770d6 100644
+--- a/build/gulpfile.reh.js
++++ b/build/gulpfile.reh.js
+@@ -229,9 +229,23 @@ function nodejs(platform, arch) {
+ 		case 'linux':
+-			return (product.nodejsRepository !== 'https://nodejs.org' ?
+-				fetchGithub(product.nodejsRepository, { version: `${nodeVersion}-${internalNodeVersion}`, name: expectedName, checksumSha256 }) :
+-				fetchUrls(`/dist/v${nodeVersion}/node-v${nodeVersion}-${platform}-${arch}.tar.gz`, { base: 'https://nodejs.org', checksumSha256 })
+-			).pipe(flatmap(stream => stream.pipe(gunzip()).pipe(untar())))
+-				.pipe(filter('**/node'))
+-				.pipe(util.setExecutableBit('**'))
+-				.pipe(rename('node'));
++			if (process.env.VSCODE_NODEJS_SITE && process.env.VSCODE_NODEJS_URLROOT) {
++				return fetchUrls(`${process.env.VSCODE_NODEJS_URLROOT}/v${nodeVersion}/node-v${nodeVersion}-${platform}-${arch}${process.env.VSCODE_NODEJS_URLSUFFIX}.tar.gz`, { base: process.env.VSCODE_NODEJS_SITE, checksumSha256 })
++					.pipe(flatmap(stream => stream.pipe(gunzip()).pipe(untar())))
++					.pipe(filter('**/node'))
++					.pipe(util.setExecutableBit('**'))
++					.pipe(rename('node'));
++			}
++			if (product.nodejsRepository !== 'https://nodejs.org') {
++				return fetchGithub(product.nodejsRepository, { version: `${nodeVersion}-${internalNodeVersion}`, name: expectedName, checksumSha256 })
++					.pipe(flatmap(stream => stream.pipe(gunzip()).pipe(untar())))
++					.pipe(filter('**/node'))
++					.pipe(util.setExecutableBit('**'))
++					.pipe(rename('node'));
++			}
++			else {
++				return fetchUrls(`/dist/v${nodeVersion}/node-v${nodeVersion}-${platform}-${arch}.tar.gz`, { base: 'https://nodejs.org', checksumSha256 })
++					.pipe(flatmap(stream => stream.pipe(gunzip()).pipe(untar())))
++					.pipe(filter('**/node'))
++					.pipe(util.setExecutableBit('**'))
++					.pipe(rename('node'));
++			}
+ 		case 'alpine':
+diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
+index da753e9..95f2cf0 100644
+--- a/build/gulpfile.vscode.js
++++ b/build/gulpfile.vscode.js
+@@ -385,2 +385,12 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+ 
++		const electronOverride = {};
++		if (process.env.VSCODE_ELECTRON_REPOSITORY) {
++			// official electron doesn't support all arch, override the repo with `VSCODE_ELECTRON_REPOSITORY`.
++			electronOverride.repo = process.env.VSCODE_ELECTRON_REPOSITORY;
++		}
++
++		if (process.env.VSCODE_ELECTRON_TAG) {
++			electronOverride.tag = process.env.VSCODE_ELECTRON_TAG;
++		}
++
+ 		let result = all
+@@ -389,3 +399,3 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+ 			.pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523
+-			.pipe(electron({ ...config, platform, arch: arch === 'armhf' ? 'arm' : arch, ffmpegChromium: false }))
++			.pipe(electron({ ...config, ...electronOverride, platform, arch: arch === 'armhf' ? 'arm' : arch, ffmpegChromium: false }))
+ 			.pipe(filter(['**', '!LICENSE', '!version'], { dot: true }));
+diff --git a/build/linux/debian/dep-lists.js b/build/linux/debian/dep-lists.js
+index 3bb58fb..306d91e 100644
+--- a/build/linux/debian/dep-lists.js
++++ b/build/linux/debian/dep-lists.js
+@@ -138,3 +138,3 @@ exports.referenceGeneratedDepsByArch = {
+         'xdg-utils (>= 1.0.2)'
+-    ]
++    ],
+ };
+diff --git a/build/linux/debian/dep-lists.ts b/build/linux/debian/dep-lists.ts
+index e3d78d1..9f29943 100644
+--- a/build/linux/debian/dep-lists.ts
++++ b/build/linux/debian/dep-lists.ts
+@@ -138,3 +138,3 @@ export const referenceGeneratedDepsByArch = {
+ 		'xdg-utils (>= 1.0.2)'
+-	]
++	],
+ };
+diff --git a/build/linux/debian/install-sysroot.js b/build/linux/debian/install-sysroot.js
+index 354c67a..2cd8f2d 100644
+--- a/build/linux/debian/install-sysroot.js
++++ b/build/linux/debian/install-sysroot.js
+@@ -71,3 +71,5 @@ async function fetchUrl(options, retries = 10, retryDelay = 1000) {
+         try {
+-            const response = await fetch(`https://api.github.com/repos/Microsoft/vscode-linux-build-agent/releases/tags/v${version}`, {
++            const repository = process.env['VSCODE_SYSROOT_REPOSITORY'] ?? 'Microsoft/vscode-linux-build-agent';
++            const actualVersion = process.env['VSCODE_SYSROOT_VERSION'] ?? version;
++            const response = await fetch(`https://api.github.com/repos/${repository}/releases/tags/v${actualVersion}`, {
+                 headers: ghApiHeaders,
+@@ -80,3 +82,3 @@ async function fetchUrl(options, retries = 10, retryDelay = 1000) {
+                 if (!asset) {
+-                    throw new Error(`Could not find asset in release of Microsoft/vscode-linux-build-agent @ ${version}`);
++                    throw new Error(`Could not find asset in release of ${repository} @ ${actualVersion}`);
+                 }
+diff --git a/build/linux/debian/install-sysroot.ts b/build/linux/debian/install-sysroot.ts
+index 8ea43a5..d8de38e 100644
+--- a/build/linux/debian/install-sysroot.ts
++++ b/build/linux/debian/install-sysroot.ts
+@@ -83,3 +83,5 @@ async function fetchUrl(options: IFetchOptions, retries = 10, retryDelay = 1000)
+ 		try {
+-			const response = await fetch(`https://api.github.com/repos/Microsoft/vscode-linux-build-agent/releases/tags/v${version}`, {
++			const repository = process.env['VSCODE_SYSROOT_REPOSITORY'] ?? 'Microsoft/vscode-linux-build-agent';
++			const actualVersion = process.env['VSCODE_SYSROOT_VERSION'] ?? version;
++			const response = await fetch(`https://api.github.com/repos/${repository}/releases/tags/v${actualVersion}`, {
+ 				headers: ghApiHeaders,
+@@ -92,3 +94,3 @@ async function fetchUrl(options: IFetchOptions, retries = 10, retryDelay = 1000)
+ 				if (!asset) {
+-					throw new Error(`Could not find asset in release of Microsoft/vscode-linux-build-agent @ ${version}`);
++					throw new Error(`Could not find asset in release of ${repository} @ ${actualVersion}`);
+ 				}

patches/linux/arch-1-ppc64le.patch

@@ -0,0 +1,553 @@
+diff --git a/build/azure-pipelines/linux/setup-env.sh b/build/azure-pipelines/linux/setup-env.sh
+index fbe67b0..5b2f5d8 100755
+--- a/build/azure-pipelines/linux/setup-env.sh
++++ b/build/azure-pipelines/linux/setup-env.sh
+@@ -74,2 +74,14 @@ elif [ "$npm_config_arch" == "arm" ]; then
+   export VSCODE_REMOTE_LDFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot -L$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot/usr/lib/arm-linux-gnueabihf -L$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot/lib/arm-linux-gnueabihf"
++elif [ "$npm_config_arch" == "ppc64" ]; then
++	# Set compiler toolchain for client native modules
++	export CC=$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/bin/powerpc64le-linux-gnu-gcc
++	export CXX=$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/bin/powerpc64le-linux-gnu-g++
++	export CXXFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/powerpc64le-linux-gnu/sysroot"
++	export LDFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/powerpc64le-linux-gnu/sysroot -L$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/powerpc64le-linux-gnu/sysroot/usr/lib/powerpc64le-linux-gnu -L$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/powerpc64le-linux-gnu/sysroot/lib/powerpc64le-linux-gnu"
++
++	# Set compiler toolchain for remote server
++	export VSCODE_REMOTE_CC=$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/bin/powerpc64le-linux-gnu-gcc
++	export VSCODE_REMOTE_CXX=$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/bin/powerpc64le-linux-gnu-g++
++	export VSCODE_REMOTE_CXXFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/powerpc64le-linux-gnu/sysroot"
++	export VSCODE_REMOTE_LDFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/powerpc64le-linux-gnu/sysroot -L$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/powerpc64le-linux-gnu/sysroot/usr/lib/powerpc64le-linux-gnu -L$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/powerpc64le-linux-gnu/sysroot/lib/powerpc64le-linux-gnu"
+ fi
+diff --git a/build/azure-pipelines/linux/verify-glibc-requirements.sh b/build/azure-pipelines/linux/verify-glibc-requirements.sh
+index c655ce7..c7150f2 100755
+--- a/build/azure-pipelines/linux/verify-glibc-requirements.sh
++++ b/build/azure-pipelines/linux/verify-glibc-requirements.sh
+@@ -9,2 +9,4 @@ elif [ "$VSCODE_ARCH" == "armhf" ]; then
+   TRIPLE="arm-rpi-linux-gnueabihf"
++elif [ "$VSCODE_ARCH" == "ppc64le" ]; then
++  TRIPLE="powerpc64le-linux-gnu"
+ fi
+diff --git a/build/checksums/vscode-sysroot.txt b/build/checksums/vscode-sysroot.txt
+index 0b5f38c..9f3b02b 100644
+--- a/build/checksums/vscode-sysroot.txt
++++ b/build/checksums/vscode-sysroot.txt
+@@ -6 +6,2 @@
+ dbb927408393041664a020661f2641c9785741be3d29b050b9dac58980967784  x86_64-linux-gnu-glibc-2.28.tar.gz
++fa8176d27be18bb0eeb7f55b0fa22255050b430ef68c29136599f02976eb0b1b  powerpc64le-linux-gnu-glibc-2.28.tar.gz
+diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
+index d0770d6..8c83c13 100644
+--- a/build/gulpfile.reh.js
++++ b/build/gulpfile.reh.js
+@@ -50,2 +50,3 @@ const BUILD_TARGETS = [
+ 	{ platform: 'linux', arch: 'arm64' },
++	{ platform: 'linux', arch: 'ppc64le' },
+ 	{ platform: 'alpine', arch: 'arm64' },
+diff --git a/build/gulpfile.scan.js b/build/gulpfile.scan.js
+index cbcdddb..274d889 100644
+--- a/build/gulpfile.scan.js
++++ b/build/gulpfile.scan.js
+@@ -26,2 +26,3 @@ const BUILD_TARGETS = [
+ 	{ platform: 'linux', arch: 'arm64' },
++	{ platform: 'linux', arch: 'ppc64le' },
+ ];
+diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
+index 95f2cf0..7395ba4 100644
+--- a/build/gulpfile.vscode.js
++++ b/build/gulpfile.vscode.js
+@@ -494,2 +494,3 @@ const BUILD_TARGETS = [
+ 	{ platform: 'linux', arch: 'arm64' },
++	{ platform: 'linux', arch: 'ppc64le' },
+ ];
+diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js
+index fb0e5a4..264cec1 100644
+--- a/build/gulpfile.vscode.linux.js
++++ b/build/gulpfile.vscode.linux.js
+@@ -33,3 +33,3 @@ const linuxPackageRevision = Math.floor(new Date().getTime() / 1000);
+ function getDebPackageArch(arch) {
+-	return { x64: 'amd64', armhf: 'armhf', arm64: 'arm64' }[arch];
++	return { x64: 'amd64', armhf: 'armhf', arm64: 'arm64', ppc64le: 'ppc64el' }[arch];
+ }
+@@ -145,3 +145,3 @@ function getRpmBuildPath(rpmArch) {
+ function getRpmPackageArch(arch) {
+-	return { x64: 'x86_64', armhf: 'armv7hl', arm64: 'aarch64' }[arch];
++	return { x64: 'x86_64', armhf: 'armv7hl', arm64: 'aarch64', ppc64le: 'ppc64le' }[arch];
+ }
+@@ -307,2 +307,3 @@ const BUILD_TARGETS = [
+ 	{ arch: 'arm64' },
++	{ arch: 'ppc64le' },
+ ];
+diff --git a/build/linux/debian/calculate-deps.js b/build/linux/debian/calculate-deps.js
+index 57934e6..b97d275 100644
+--- a/build/linux/debian/calculate-deps.js
++++ b/build/linux/debian/calculate-deps.js
+@@ -51,2 +51,5 @@ function calculatePackageDeps(binaryPath, arch, chromiumSysroot, vscodeSysroot)
+             break;
++		case 'ppc64el':
++			cmd.push(`-l${chromiumSysroot}/usr/lib/powerpc64le-linux-gnu`, `-l${chromiumSysroot}/lib/powerpc64le-linux-gnu`, `-l${vscodeSysroot}/usr/lib/powerpc64le-linux-gnu`, `-l${vscodeSysroot}/lib/powerpc64le-linux-gnu`);
++			break;
+     }
+diff --git a/build/linux/debian/calculate-deps.ts b/build/linux/debian/calculate-deps.ts
+index c44e241..5a6e9b4 100644
+--- a/build/linux/debian/calculate-deps.ts
++++ b/build/linux/debian/calculate-deps.ts
+@@ -61,2 +61,8 @@ function calculatePackageDeps(binaryPath: string, arch: DebianArchString, chromi
+ 			break;
++		case 'ppc64el':
++			cmd.push(`-l${chromiumSysroot}/usr/lib/powerpc64le-linux-gnu`,
++				`-l${chromiumSysroot}/lib/powerpc64le-linux-gnu`,
++				`-l${vscodeSysroot}/usr/lib/powerpc64le-linux-gnu`,
++				`-l${vscodeSysroot}/lib/powerpc64le-linux-gnu`);
++			break;
+ 	}
+diff --git a/build/linux/debian/dep-lists.js b/build/linux/debian/dep-lists.js
+index 306d91e..64377e3 100644
+--- a/build/linux/debian/dep-lists.js
++++ b/build/linux/debian/dep-lists.js
+@@ -139,2 +139,41 @@ exports.referenceGeneratedDepsByArch = {
+     ],
++	'ppc64el': [
++        'ca-certificates',
++        'libasound2 (>= 1.0.17)',
++        'libatk-bridge2.0-0 (>= 2.5.3)',
++        'libatk1.0-0 (>= 2.2.0)',
++        'libatspi2.0-0 (>= 2.9.90)',
++        'libc6 (>= 2.17)',
++        'libc6 (>= 2.28)',
++        'libcairo2 (>= 1.6.0)',
++        'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3',
++        'libdbus-1-3 (>= 1.9.14)',
++        'libdrm2 (>= 2.4.75)',
++        'libexpat1 (>= 2.1~beta3)',
++        'libgbm1 (>= 17.1.0~rc2)',
++        'libglib2.0-0 (>= 2.37.3)',
++        'libgssapi-krb5-2 (>= 1.17)',
++        'libgtk-3-0 (>= 3.9.10)',
++        'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
++        'libkrb5-3 (>= 1.6.dfsg.2)',
++        'libnspr4 (>= 2:4.9-2~)',
++        'libnss3 (>= 2:3.30)',
++        'libnss3 (>= 3.26)',
++        'libpango-1.0-0 (>= 1.14.0)',
++        'libstdc++6 (>= 4.1.1)',
++        'libstdc++6 (>= 5)',
++        'libstdc++6 (>= 5.2)',
++        'libstdc++6 (>= 6)',
++        'libx11-6',
++        'libx11-6 (>= 2:1.4.99.1)',
++        'libxcb1 (>= 1.9.2)',
++        'libxcomposite1 (>= 1:0.4.4-1)',
++        'libxdamage1 (>= 1:1.1)',
++        'libxext6',
++        'libxfixes3',
++        'libxkbcommon0 (>= 0.5.0)',
++        'libxkbfile1 (>= 1:1.1.0)',
++        'libxrandr2',
++        'xdg-utils (>= 1.0.2)'
++    ],
+ };
+diff --git a/build/linux/debian/dep-lists.ts b/build/linux/debian/dep-lists.ts
+index 9f29943..aa769ad 100644
+--- a/build/linux/debian/dep-lists.ts
++++ b/build/linux/debian/dep-lists.ts
+@@ -139,2 +139,41 @@ export const referenceGeneratedDepsByArch = {
+ 	],
++	'ppc64el': [
++		'ca-certificates',
++		'libasound2 (>= 1.0.17)',
++		'libatk-bridge2.0-0 (>= 2.5.3)',
++		'libatk1.0-0 (>= 2.2.0)',
++		'libatspi2.0-0 (>= 2.9.90)',
++		'libc6 (>= 2.17)',
++		'libc6 (>= 2.28)',
++		'libcairo2 (>= 1.6.0)',
++		'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3',
++		'libdbus-1-3 (>= 1.9.14)',
++		'libdrm2 (>= 2.4.75)',
++		'libexpat1 (>= 2.1~beta3)',
++		'libgbm1 (>= 17.1.0~rc2)',
++		'libglib2.0-0 (>= 2.37.3)',
++		'libgssapi-krb5-2 (>= 1.17)',
++		'libgtk-3-0 (>= 3.9.10)',
++		'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
++		'libkrb5-3 (>= 1.6.dfsg.2)',
++		'libnspr4 (>= 2:4.9-2~)',
++		'libnss3 (>= 2:3.30)',
++		'libnss3 (>= 3.26)',
++		'libpango-1.0-0 (>= 1.14.0)',
++		'libstdc++6 (>= 4.1.1)',
++		'libstdc++6 (>= 5)',
++		'libstdc++6 (>= 5.2)',
++		'libstdc++6 (>= 6)',
++		'libx11-6',
++		'libx11-6 (>= 2:1.4.99.1)',
++		'libxcb1 (>= 1.9.2)',
++		'libxcomposite1 (>= 1:0.4.4-1)',
++		'libxdamage1 (>= 1:1.1)',
++		'libxext6',
++		'libxfixes3',
++		'libxkbcommon0 (>= 0.5.0)',
++		'libxkbfile1 (>= 1:1.1.0)',
++		'libxrandr2',
++		'xdg-utils (>= 1.0.2)'
++	],
+ };
+diff --git a/build/linux/debian/install-sysroot.js b/build/linux/debian/install-sysroot.js
+index 2cd8f2d..aef739c 100644
+--- a/build/linux/debian/install-sysroot.js
++++ b/build/linux/debian/install-sysroot.js
+@@ -137,2 +137,6 @@ async function getVSCodeSysroot(arch) {
+             break;
++		case 'ppc64le':
++            expectedName = `powerpc64le-linux-gnu${prefix}.tar.gz`;
++            triple = `powerpc64le-linux-gnu`;
++            break;
+     }
+diff --git a/build/linux/debian/install-sysroot.ts b/build/linux/debian/install-sysroot.ts
+index d8de38e..53b4866 100644
+--- a/build/linux/debian/install-sysroot.ts
++++ b/build/linux/debian/install-sysroot.ts
+@@ -154,2 +154,6 @@ export async function getVSCodeSysroot(arch: DebianArchString): Promise<string>
+ 			break;
++		case 'ppc64le':
++			expectedName = `powerpc64le-linux-gnu${prefix}.tar.gz`;
++			triple = `powerpc64le-linux-gnu`;
++			break;
+ 	}
+diff --git a/build/linux/debian/types.js b/build/linux/debian/types.js
+index ce21d50..2c56b9c 100644
+--- a/build/linux/debian/types.js
++++ b/build/linux/debian/types.js
+@@ -8,3 +8,3 @@ exports.isDebianArchString = isDebianArchString;
+ function isDebianArchString(s) {
+-    return ['amd64', 'armhf', 'arm64'].includes(s);
++    return ['amd64', 'armhf', 'arm64', 'ppc64el'].includes(s);
+ }
+diff --git a/build/linux/debian/types.ts b/build/linux/debian/types.ts
+index e97485e..43f2434 100644
+--- a/build/linux/debian/types.ts
++++ b/build/linux/debian/types.ts
+@@ -5,6 +5,6 @@
+ 
+-export type DebianArchString = 'amd64' | 'armhf' | 'arm64';
++export type DebianArchString = 'amd64' | 'armhf' | 'arm64' | 'ppc64el';
+ 
+ export function isDebianArchString(s: string): s is DebianArchString {
+-	return ['amd64', 'armhf', 'arm64'].includes(s);
++	return ['amd64', 'armhf', 'arm64', 'ppc64el'].includes(s);
+ }
+diff --git a/build/linux/rpm/dep-lists.js b/build/linux/rpm/dep-lists.js
+index 04abee1..779dd69 100644
+--- a/build/linux/rpm/dep-lists.js
++++ b/build/linux/rpm/dep-lists.js
+@@ -310,2 +310,102 @@ exports.referenceGeneratedDepsByArch = {
+         'xdg-utils'
++    ],
++    "ppc64le": [
++        'ca-certificates',
++        'ld-linux-x86-64.so.2()(64bit)',
++        'ld-linux-x86-64.so.2(GLIBC_2.3)(64bit)',
++        'ld64.so.2()(64bit)',
++        'ld64.so.2(GLIBC_2.17)(64bit)',
++        'libX11.so.6()(64bit)',
++        'libXcomposite.so.1()(64bit)',
++        'libXdamage.so.1()(64bit)',
++        'libXext.so.6()(64bit)',
++        'libXfixes.so.3()(64bit)',
++        'libXrandr.so.2()(64bit)',
++        'libasound.so.2()(64bit)',
++        'libasound.so.2(ALSA_0.9)(64bit)',
++        'libasound.so.2(ALSA_0.9.0rc4)(64bit)',
++        'libatk-1.0.so.0()(64bit)',
++        'libatk-bridge-2.0.so.0()(64bit)',
++        'libatspi.so.0()(64bit)',
++        'libc.so.6()(64bit)',
++        'libc.so.6(GLIBC_2.14)(64bit)',
++        'libc.so.6(GLIBC_2.17)(64bit)',
++        'libc.so.6(GLIBC_2.2.5)(64bit)',
++        'libc.so.6(GLIBC_2.28)(64bit)',
++        'libc.so.6(GLIBC_2.4)(64bit)',
++        'libc.so.6(GLIBC_2.9)(64bit)',
++        'libcairo.so.2()(64bit)',
++        'libcups.so.2()(64bit)',
++        'libcurl.so.4()(64bit)',
++        'libdbus-1.so.3()(64bit)',
++        'libdbus-1.so.3(LIBDBUS_1_3)(64bit)',
++        'libdl.so.2()(64bit)',
++        'libdl.so.2(GLIBC_2.17)(64bit)',
++        'libdrm.so.2()(64bit)',
++        'libexpat.so.1()(64bit)',
++        'libgbm.so.1()(64bit)',
++        'libgcc_s.so.1()(64bit)',
++        'libgcc_s.so.1(GCC_3.0)(64bit)',
++        'libgcc_s.so.1(GCC_3.4.4)(64bit)',
++        'libgio-2.0.so.0()(64bit)',
++        'libglib-2.0.so.0()(64bit)',
++        'libgobject-2.0.so.0()(64bit)',
++        'libgssapi_krb5.so.2()(64bit)',
++        'libgssapi_krb5.so.2(gssapi_krb5_2_MIT)(64bit)',
++        'libgtk-3.so.0()(64bit)',
++        'libkrb5.so.3()(64bit)',
++        'libkrb5.so.3(krb5_3_MIT)(64bit)',
++        'libm.so.6()(64bit)',
++        'libm.so.6(GLIBC_2.17)(64bit)',
++        'libm.so.6(GLIBC_2.2.5)(64bit)',
++        'libm.so.6(GLIBC_2.27)(64bit)',
++        'libnspr4.so()(64bit)',
++        'libnss3.so()(64bit)',
++        'libnss3.so(NSS_3.11)(64bit)',
++        'libnss3.so(NSS_3.12)(64bit)',
++        'libnss3.so(NSS_3.12.1)(64bit)',
++        'libnss3.so(NSS_3.2)(64bit)',
++        'libnss3.so(NSS_3.22)(64bit)',
++        'libnss3.so(NSS_3.3)(64bit)',
++        'libnss3.so(NSS_3.30)(64bit)',
++        'libnss3.so(NSS_3.4)(64bit)',
++        'libnss3.so(NSS_3.5)(64bit)',
++        'libnss3.so(NSS_3.9.2)(64bit)',
++        'libnssutil3.so()(64bit)',
++        'libnssutil3.so(NSSUTIL_3.12.3)(64bit)',
++        'libpango-1.0.so.0()(64bit)',
++        'libpthread.so.0()(64bit)',
++        'libpthread.so.0(GLIBC_2.17)(64bit)',
++        'libpthread.so.0(GLIBC_2.2.5)(64bit)',
++        'libpthread.so.0(GLIBC_2.3.2)(64bit)',
++        'libpthread.so.0(GLIBC_2.3.3)(64bit)',
++        'libsmime3.so()(64bit)',
++        'libsmime3.so(NSS_3.10)(64bit)',
++        'libsmime3.so(NSS_3.2)(64bit)',
++        'libssl3.so(NSS_3.28)(64bit)',
++        'libstdc++.so.6()(64bit)',
++        'libstdc++.so.6(CXXABI_1.3)(64bit)',
++        'libstdc++.so.6(CXXABI_1.3.5)(64bit)',
++        'libstdc++.so.6(CXXABI_1.3.8)(64bit)',
++        'libstdc++.so.6(CXXABI_1.3.9)(64bit)',
++        'libstdc++.so.6(GLIBCXX_3.4)(64bit)',
++        'libstdc++.so.6(GLIBCXX_3.4.11)(64bit)',
++        'libstdc++.so.6(GLIBCXX_3.4.14)(64bit)',
++        'libstdc++.so.6(GLIBCXX_3.4.15)(64bit)',
++        'libstdc++.so.6(GLIBCXX_3.4.18)(64bit)',
++        'libstdc++.so.6(GLIBCXX_3.4.19)(64bit)',
++        'libstdc++.so.6(GLIBCXX_3.4.20)(64bit)',
++        'libstdc++.so.6(GLIBCXX_3.4.21)(64bit)',
++        'libstdc++.so.6(GLIBCXX_3.4.22)(64bit)',
++        'libstdc++.so.6(GLIBCXX_3.4.5)(64bit)',
++        'libstdc++.so.6(GLIBCXX_3.4.9)(64bit)',
++        'libutil.so.1()(64bit)',
++        'libutil.so.1(GLIBC_2.2.5)(64bit)',
++        'libxcb.so.1()(64bit)',
++        'libxkbcommon.so.0()(64bit)',
++        'libxkbcommon.so.0(V_0.5.0)(64bit)',
++        'libxkbfile.so.1()(64bit)',
++        'rpmlib(FileDigests) <= 4.6.0-1',
++        'rtld(GNU_HASH)',
++        'xdg-utils'
+     ]
+diff --git a/build/linux/rpm/dep-lists.ts b/build/linux/rpm/dep-lists.ts
+index 8761e40..1885210 100644
+--- a/build/linux/rpm/dep-lists.ts
++++ b/build/linux/rpm/dep-lists.ts
+@@ -309,2 +309,102 @@ export const referenceGeneratedDepsByArch = {
+ 		'xdg-utils'
++	],
++	"ppc64le": [
++		'ca-certificates',
++		'ld-linux-x86-64.so.2()(64bit)',
++		'ld-linux-x86-64.so.2(GLIBC_2.3)(64bit)',
++		'ld64.so.2()(64bit)',
++		'ld64.so.2(GLIBC_2.17)(64bit)',
++		'libX11.so.6()(64bit)',
++		'libXcomposite.so.1()(64bit)',
++		'libXdamage.so.1()(64bit)',
++		'libXext.so.6()(64bit)',
++		'libXfixes.so.3()(64bit)',
++		'libXrandr.so.2()(64bit)',
++		'libasound.so.2()(64bit)',
++		'libasound.so.2(ALSA_0.9)(64bit)',
++		'libasound.so.2(ALSA_0.9.0rc4)(64bit)',
++		'libatk-1.0.so.0()(64bit)',
++		'libatk-bridge-2.0.so.0()(64bit)',
++		'libatspi.so.0()(64bit)',
++		'libc.so.6()(64bit)',
++		'libc.so.6(GLIBC_2.14)(64bit)',
++		'libc.so.6(GLIBC_2.17)(64bit)',
++		'libc.so.6(GLIBC_2.2.5)(64bit)',
++		'libc.so.6(GLIBC_2.28)(64bit)',
++		'libc.so.6(GLIBC_2.4)(64bit)',
++		'libc.so.6(GLIBC_2.9)(64bit)',
++		'libcairo.so.2()(64bit)',
++		'libcups.so.2()(64bit)',
++		'libcurl.so.4()(64bit)',
++		'libdbus-1.so.3()(64bit)',
++		'libdbus-1.so.3(LIBDBUS_1_3)(64bit)',
++		'libdl.so.2()(64bit)',
++		'libdl.so.2(GLIBC_2.17)(64bit)',
++		'libdrm.so.2()(64bit)',
++		'libexpat.so.1()(64bit)',
++		'libgbm.so.1()(64bit)',
++		'libgcc_s.so.1()(64bit)',
++		'libgcc_s.so.1(GCC_3.0)(64bit)',
++		'libgcc_s.so.1(GCC_3.4.4)(64bit)',
++		'libgio-2.0.so.0()(64bit)',
++		'libglib-2.0.so.0()(64bit)',
++		'libgobject-2.0.so.0()(64bit)',
++		'libgssapi_krb5.so.2()(64bit)',
++		'libgssapi_krb5.so.2(gssapi_krb5_2_MIT)(64bit)',
++		'libgtk-3.so.0()(64bit)',
++		'libkrb5.so.3()(64bit)',
++		'libkrb5.so.3(krb5_3_MIT)(64bit)',
++		'libm.so.6()(64bit)',
++		'libm.so.6(GLIBC_2.17)(64bit)',
++		'libm.so.6(GLIBC_2.2.5)(64bit)',
++		'libm.so.6(GLIBC_2.27)(64bit)',
++		'libnspr4.so()(64bit)',
++		'libnss3.so()(64bit)',
++		'libnss3.so(NSS_3.11)(64bit)',
++		'libnss3.so(NSS_3.12)(64bit)',
++		'libnss3.so(NSS_3.12.1)(64bit)',
++		'libnss3.so(NSS_3.2)(64bit)',
++		'libnss3.so(NSS_3.22)(64bit)',
++		'libnss3.so(NSS_3.3)(64bit)',
++		'libnss3.so(NSS_3.30)(64bit)',
++		'libnss3.so(NSS_3.4)(64bit)',
++		'libnss3.so(NSS_3.5)(64bit)',
++		'libnss3.so(NSS_3.9.2)(64bit)',
++		'libnssutil3.so()(64bit)',
++		'libnssutil3.so(NSSUTIL_3.12.3)(64bit)',
++		'libpango-1.0.so.0()(64bit)',
++		'libpthread.so.0()(64bit)',
++		'libpthread.so.0(GLIBC_2.17)(64bit)',
++		'libpthread.so.0(GLIBC_2.2.5)(64bit)',
++		'libpthread.so.0(GLIBC_2.3.2)(64bit)',
++		'libpthread.so.0(GLIBC_2.3.3)(64bit)',
++		'libsmime3.so()(64bit)',
++		'libsmime3.so(NSS_3.10)(64bit)',
++		'libsmime3.so(NSS_3.2)(64bit)',
++		'libssl3.so(NSS_3.28)(64bit)',
++		'libstdc++.so.6()(64bit)',
++		'libstdc++.so.6(CXXABI_1.3)(64bit)',
++		'libstdc++.so.6(CXXABI_1.3.5)(64bit)',
++		'libstdc++.so.6(CXXABI_1.3.8)(64bit)',
++		'libstdc++.so.6(CXXABI_1.3.9)(64bit)',
++		'libstdc++.so.6(GLIBCXX_3.4)(64bit)',
++		'libstdc++.so.6(GLIBCXX_3.4.11)(64bit)',
++		'libstdc++.so.6(GLIBCXX_3.4.14)(64bit)',
++		'libstdc++.so.6(GLIBCXX_3.4.15)(64bit)',
++		'libstdc++.so.6(GLIBCXX_3.4.18)(64bit)',
++		'libstdc++.so.6(GLIBCXX_3.4.19)(64bit)',
++		'libstdc++.so.6(GLIBCXX_3.4.20)(64bit)',
++		'libstdc++.so.6(GLIBCXX_3.4.21)(64bit)',
++		'libstdc++.so.6(GLIBCXX_3.4.22)(64bit)',
++		'libstdc++.so.6(GLIBCXX_3.4.5)(64bit)',
++		'libstdc++.so.6(GLIBCXX_3.4.9)(64bit)',
++		'libutil.so.1()(64bit)',
++		'libutil.so.1(GLIBC_2.2.5)(64bit)',
++		'libxcb.so.1()(64bit)',
++		'libxkbcommon.so.0()(64bit)',
++		'libxkbcommon.so.0(V_0.5.0)(64bit)',
++		'libxkbfile.so.1()(64bit)',
++		'rpmlib(FileDigests) <= 4.6.0-1',
++		'rtld(GNU_HASH)',
++		'xdg-utils'
+ 	]
+diff --git a/build/linux/rpm/types.js b/build/linux/rpm/types.js
+index a20b9c2..7b58961 100644
+--- a/build/linux/rpm/types.js
++++ b/build/linux/rpm/types.js
+@@ -8,3 +8,3 @@ exports.isRpmArchString = isRpmArchString;
+ function isRpmArchString(s) {
+-    return ['x86_64', 'armv7hl', 'aarch64'].includes(s);
++    return ['x86_64', 'armv7hl', 'aarch64', 'ppc64le'].includes(s);
+ }
+diff --git a/build/linux/rpm/types.ts b/build/linux/rpm/types.ts
+index c6a01da..3f3c3f5 100644
+--- a/build/linux/rpm/types.ts
++++ b/build/linux/rpm/types.ts
+@@ -5,6 +5,6 @@
+ 
+-export type RpmArchString = 'x86_64' | 'armv7hl' | 'aarch64';
++export type RpmArchString = 'x86_64' | 'armv7hl' | 'aarch64' | 'ppc64le';
+ 
+ export function isRpmArchString(s: string): s is RpmArchString {
+-	return ['x86_64', 'armv7hl', 'aarch64'].includes(s);
++	return ['x86_64', 'armv7hl', 'aarch64', 'ppc64le'].includes(s);
+ }
+diff --git a/cli/src/update_service.rs b/cli/src/update_service.rs
+index 9033914..bcab676 100644
+--- a/cli/src/update_service.rs
++++ b/cli/src/update_service.rs
+@@ -217,2 +217,4 @@ pub enum Platform {
+ 	LinuxARM32Legacy,
++	LinuxPPC64LE,
++	LinuxPPC64LELegacy,
+ 	DarwinX64,
+@@ -230,2 +232,3 @@ impl Platform {
+ 			Platform::LinuxARM32 => Some("linux-armhf".to_owned()),
++			Platform::LinuxPPC64LE => Some("linux-ppc64le".to_owned()),
+ 			Platform::DarwinX64 => Some("darwin".to_owned()),
+@@ -248,2 +251,4 @@ impl Platform {
+ 			Platform::LinuxARM32Legacy => "server-linux-legacy-armhf",
++			Platform::LinuxPPC64LE => "server-linux-ppc64le",
++			Platform::LinuxPPC64LELegacy => "server-linux-legacy-ppc64le",
+ 			Platform::DarwinX64 => "server-darwin",
+@@ -267,2 +272,4 @@ impl Platform {
+ 			Platform::LinuxARM32Legacy => "cli-linux-armhf",
++			Platform::LinuxPPC64LE => "cli-linux-ppc64le",
++			Platform::LinuxPPC64LELegacy => "cli-linux-ppc64le",
+ 			Platform::DarwinX64 => "cli-darwin-x64",
+@@ -299,2 +306,4 @@ impl Platform {
+ 			Some(Platform::LinuxARM64)
++		} else if cfg!(all(target_os = "linux", target_arch = "ppc64le")) {
++			Some(Platform::LinuxPPC64LE)
+ 		} else if cfg!(all(target_os = "macos", target_arch = "x86_64")) {
+@@ -326,2 +335,4 @@ impl fmt::Display for Platform {
+ 			Platform::LinuxARM32Legacy => "LinuxARM32Legacy",
++			Platform::LinuxPPC64LE => "LinuxPPC64LE",
++			Platform::LinuxPPC64LELegacy => "LinuxPPC64LELegacy",
+ 			Platform::DarwinX64 => "DarwinX64",
+diff --git a/cli/src/util/prereqs.rs b/cli/src/util/prereqs.rs
+index e0fba27..4827a47 100644
+--- a/cli/src/util/prereqs.rs
++++ b/cli/src/util/prereqs.rs
+@@ -86,2 +86,4 @@ impl PreReqChecker {
+ 					Platform::LinuxARM32
++				} else if cfg!(target_arch = "ppc64le") {
++					Platform::LinuxPPC64LE
+ 				} else {
+@@ -95,2 +97,4 @@ impl PreReqChecker {
+ 					Platform::LinuxARM32Legacy
++				} else if cfg!(target_arch = "ppc64le") {
++					Platform::LinuxPPC64LELegacy
+ 				} else {
+diff --git a/resources/server/bin/helpers/check-requirements-linux.sh b/resources/server/bin/helpers/check-requirements-linux.sh
+index 8ef07a2..00dd3e2 100644
+--- a/resources/server/bin/helpers/check-requirements-linux.sh
++++ b/resources/server/bin/helpers/check-requirements-linux.sh
+@@ -56,2 +56,3 @@ case $ARCH in
+ 		;;
++    ppc64el) LDCONFIG_ARCH="64bit";;
+ esac
+diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts
+index ea7b30d..004df84 100644
+--- a/src/vs/platform/extensionManagement/common/extensionManagement.ts
++++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts
+@@ -41,2 +41,3 @@ export function TargetPlatformToString(targetPlatform: TargetPlatform) {
+ 		case TargetPlatform.LINUX_ARMHF: return 'Linux ARM';
++		case TargetPlatform.LINUX_PPC64LE: return 'Linux PowerPC64';
+ 
+@@ -64,2 +65,3 @@ export function toTargetPlatform(targetPlatform: string): TargetPlatform {
+ 		case TargetPlatform.LINUX_ARMHF: return TargetPlatform.LINUX_ARMHF;
++		case TargetPlatform.LINUX_PPC64LE: return TargetPlatform.LINUX_PPC64LE;
+ 
+@@ -99,2 +101,5 @@ export function getTargetPlatform(platform: Platform | 'alpine', arch: string |
+ 			}
++			if (arch === 'ppc64le') {
++				return TargetPlatform.LINUX_PPC64LE;
++			}
+ 			return TargetPlatform.UNKNOWN;
+diff --git a/src/vs/platform/extensions/common/extensions.ts b/src/vs/platform/extensions/common/extensions.ts
+index 5973d4d..a7d6298 100644
+--- a/src/vs/platform/extensions/common/extensions.ts
++++ b/src/vs/platform/extensions/common/extensions.ts
+@@ -294,2 +294,3 @@ export const enum TargetPlatform {
+ 	LINUX_ARMHF = 'linux-armhf',
++	LINUX_PPC64LE = 'linux-ppc64le',
+ 

patches/linux/arch-2-riscv64.patch

@@ -0,0 +1,297 @@
+diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
+index 8c83c13..b996472 100644
+--- a/build/gulpfile.reh.js
++++ b/build/gulpfile.reh.js
+@@ -51,2 +51,3 @@ const BUILD_TARGETS = [
+ 	{ platform: 'linux', arch: 'ppc64le' },
++	{ platform: 'linux', arch: 'riscv64' },
+ 	{ platform: 'alpine', arch: 'arm64' },
+diff --git a/build/gulpfile.scan.js b/build/gulpfile.scan.js
+index 274d889..0eafadc 100644
+--- a/build/gulpfile.scan.js
++++ b/build/gulpfile.scan.js
+@@ -27,2 +27,3 @@ const BUILD_TARGETS = [
+ 	{ platform: 'linux', arch: 'ppc64le' },
++	{ platform: 'linux', arch: 'riscv64' },
+ ];
+diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
+index 7395ba4..66bf180 100644
+--- a/build/gulpfile.vscode.js
++++ b/build/gulpfile.vscode.js
+@@ -495,2 +495,3 @@ const BUILD_TARGETS = [
+ 	{ platform: 'linux', arch: 'ppc64le' },
++	{ platform: 'linux', arch: 'riscv64' },
+ ];
+diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js
+index 264cec1..37575e1 100644
+--- a/build/gulpfile.vscode.linux.js
++++ b/build/gulpfile.vscode.linux.js
+@@ -33,3 +33,3 @@ const linuxPackageRevision = Math.floor(new Date().getTime() / 1000);
+ function getDebPackageArch(arch) {
+-	return { x64: 'amd64', armhf: 'armhf', arm64: 'arm64', ppc64le: 'ppc64el' }[arch];
++	return { x64: 'amd64', armhf: 'armhf', arm64: 'arm64', ppc64le: 'ppc64el', riscv64: 'riscv64' }[arch];
+ }
+@@ -145,3 +145,3 @@ function getRpmBuildPath(rpmArch) {
+ function getRpmPackageArch(arch) {
+-	return { x64: 'x86_64', armhf: 'armv7hl', arm64: 'aarch64', ppc64le: 'ppc64le' }[arch];
++	return { x64: 'x86_64', armhf: 'armv7hl', arm64: 'aarch64', ppc64le: 'ppc64le', riscv64: 'riscv64' }[arch];
+ }
+@@ -308,2 +308,3 @@ const BUILD_TARGETS = [
+ 	{ arch: 'ppc64le' },
++	{ arch: 'riscv64' },
+ ];
+diff --git a/build/linux/debian/calculate-deps.js b/build/linux/debian/calculate-deps.js
+index b97d275..37a5835 100644
+--- a/build/linux/debian/calculate-deps.js
++++ b/build/linux/debian/calculate-deps.js
+@@ -54,2 +54,5 @@ function calculatePackageDeps(binaryPath, arch, chromiumSysroot, vscodeSysroot)
+ 			break;
++		case 'riscv64':
++			cmd.push(`-l${chromiumSysroot}/usr/lib/riscv64-linux-gnu`, `-l${chromiumSysroot}/lib/riscv64-linux-gnu`, `-l${vscodeSysroot}/usr/lib/riscv64-linux-gnu`, `-l${vscodeSysroot}/lib/riscv64-linux-gnu`);
++			break;
+     }
+diff --git a/build/linux/debian/calculate-deps.ts b/build/linux/debian/calculate-deps.ts
+index 5a6e9b4..903375f 100644
+--- a/build/linux/debian/calculate-deps.ts
++++ b/build/linux/debian/calculate-deps.ts
+@@ -67,2 +67,8 @@ function calculatePackageDeps(binaryPath: string, arch: DebianArchString, chromi
+ 			break;
++		case 'riscv64':
++			cmd.push(`-l${chromiumSysroot}/usr/lib/riscv64-linux-gnu`,
++				`-l${chromiumSysroot}/lib/riscv64-linux-gnu`,
++				`-l${vscodeSysroot}/usr/lib/riscv64-linux-gnu`,
++				`-l${vscodeSysroot}/lib/riscv64-linux-gnu`);
++			break;
+ 	}
+diff --git a/build/linux/debian/dep-lists.js b/build/linux/debian/dep-lists.js
+index 64377e3..5fb20f8 100644
+--- a/build/linux/debian/dep-lists.js
++++ b/build/linux/debian/dep-lists.js
+@@ -178,2 +178,42 @@ exports.referenceGeneratedDepsByArch = {
+     ],
++	'riscv64': [
++        'ca-certificates',
++        'libatomic1',
++        'libasound2 (>= 1.0.17)',
++        'libatk-bridge2.0-0 (>= 2.5.3)',
++        'libatk1.0-0 (>= 2.2.0)',
++        'libatspi2.0-0 (>= 2.9.90)',
++        'libc6 (>= 2.17)',
++        'libc6 (>= 2.28)',
++        'libcairo2 (>= 1.6.0)',
++        'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3',
++        'libdbus-1-3 (>= 1.0.2)',
++        'libdrm2 (>= 2.4.60)',
++        'libexpat1 (>= 2.0.1)',
++        'libgbm1 (>= 17.1.0~rc2)',
++        'libglib2.0-0 (>= 2.16.0)',
++        'libglib2.0-0 (>= 2.39.4)',
++        'libgtk-3-0 (>= 3.9.10)',
++        'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
++        'libnspr4 (>= 2:4.9-2~)',
++        'libnss3 (>= 2:3.22)',
++        'libnss3 (>= 3.26)',
++        'libpango-1.0-0 (>= 1.14.0)',
++        'libsecret-1-0 (>= 0.18)',
++        'libstdc++6 (>= 4.1.1)',
++        'libstdc++6 (>= 5)',
++        'libstdc++6 (>= 5.2)',
++        'libstdc++6 (>= 6)',
++        'libx11-6',
++        'libx11-6 (>= 2:1.4.99.1)',
++        'libxcb1 (>= 1.9.2)',
++        'libxcomposite1 (>= 1:0.4.4-1)',
++        'libxdamage1 (>= 1:1.1)',
++        'libxext6',
++        'libxfixes3',
++        'libxkbcommon0 (>= 0.4.1)',
++        'libxkbfile1',
++        'libxrandr2',
++        'xdg-utils (>= 1.0.2)'
++    ],
+ };
+diff --git a/build/linux/debian/dep-lists.ts b/build/linux/debian/dep-lists.ts
+index aa769ad..5534874 100644
+--- a/build/linux/debian/dep-lists.ts
++++ b/build/linux/debian/dep-lists.ts
+@@ -178,2 +178,42 @@ export const referenceGeneratedDepsByArch = {
+ 	],
++	'riscv64': [
++		'ca-certificates',
++		'libatomic1',
++		'libasound2 (>= 1.0.17)',
++		'libatk-bridge2.0-0 (>= 2.5.3)',
++		'libatk1.0-0 (>= 2.2.0)',
++		'libatspi2.0-0 (>= 2.9.90)',
++		'libc6 (>= 2.17)',
++		'libc6 (>= 2.28)',
++		'libcairo2 (>= 1.6.0)',
++		'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3',
++		'libdbus-1-3 (>= 1.0.2)',
++		'libdrm2 (>= 2.4.60)',
++		'libexpat1 (>= 2.0.1)',
++		'libgbm1 (>= 17.1.0~rc2)',
++		'libglib2.0-0 (>= 2.16.0)',
++		'libglib2.0-0 (>= 2.39.4)',
++		'libgtk-3-0 (>= 3.9.10)',
++		'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
++		'libnspr4 (>= 2:4.9-2~)',
++		'libnss3 (>= 2:3.22)',
++		'libnss3 (>= 3.26)',
++		'libpango-1.0-0 (>= 1.14.0)',
++		'libsecret-1-0 (>= 0.18)',
++		'libstdc++6 (>= 4.1.1)',
++		'libstdc++6 (>= 5)',
++		'libstdc++6 (>= 5.2)',
++		'libstdc++6 (>= 6)',
++		'libx11-6',
++		'libx11-6 (>= 2:1.4.99.1)',
++		'libxcb1 (>= 1.9.2)',
++		'libxcomposite1 (>= 1:0.4.4-1)',
++		'libxdamage1 (>= 1:1.1)',
++		'libxext6',
++		'libxfixes3',
++		'libxkbcommon0 (>= 0.4.1)',
++		'libxkbfile1',
++		'libxrandr2',
++		'xdg-utils (>= 1.0.2)'
++	],
+ };
+diff --git a/build/linux/debian/install-sysroot.js b/build/linux/debian/install-sysroot.js
+index 3dcd5c1..b4e3542 100644
+--- a/build/linux/debian/install-sysroot.js
++++ b/build/linux/debian/install-sysroot.js
+@@ -141,2 +141,6 @@ async function getVSCodeSysroot(arch) {
+             break;
++	    case 'riscv64':
++	             expectedName = `riscv64-linux-gnu${prefix}.tar.gz`;
++	             triple = 'riscv64-linux-gnu';
++	             break;
+     }
+diff --git a/build/linux/debian/install-sysroot.ts b/build/linux/debian/install-sysroot.ts
+index 52b3422..11d54b1 100644
+--- a/build/linux/debian/install-sysroot.ts
++++ b/build/linux/debian/install-sysroot.ts
+@@ -158,2 +158,6 @@ export async function getVSCodeSysroot(arch: DebianArchString): Promise<string>
+ 			break;
++		case 'riscv64':
++			expectedName = `riscv64-linux-gnu${prefix}.tar.gz`;
++			triple = 'riscv64-linux-gnu';
++			break;
+ 	}
+diff --git a/build/linux/debian/types.js b/build/linux/debian/types.js
+index 2c56b9c..cadefc2 100644
+--- a/build/linux/debian/types.js
++++ b/build/linux/debian/types.js
+@@ -8,3 +8,3 @@ exports.isDebianArchString = isDebianArchString;
+ function isDebianArchString(s) {
+-    return ['amd64', 'armhf', 'arm64', 'ppc64el'].includes(s);
++    return ['amd64', 'armhf', 'arm64', 'ppc64el', 'riscv64'].includes(s);
+ }
+diff --git a/build/linux/debian/types.ts b/build/linux/debian/types.ts
+index 43f2434..24fe452 100644
+--- a/build/linux/debian/types.ts
++++ b/build/linux/debian/types.ts
+@@ -5,6 +5,6 @@
+ 
+-export type DebianArchString = 'amd64' | 'armhf' | 'arm64' | 'ppc64el';
++export type DebianArchString = 'amd64' | 'armhf' | 'arm64' | 'ppc64el' | 'riscv64';
+ 
+ export function isDebianArchString(s: string): s is DebianArchString {
+-	return ['amd64', 'armhf', 'arm64', 'ppc64el'].includes(s);
++	return ['amd64', 'armhf', 'arm64', 'ppc64el', 'riscv64'].includes(s);
+ }
+diff --git a/build/linux/rpm/types.js b/build/linux/rpm/types.js
+index 7b58961..99a8cff 100644
+--- a/build/linux/rpm/types.js
++++ b/build/linux/rpm/types.js
+@@ -8,3 +8,3 @@ exports.isRpmArchString = isRpmArchString;
+ function isRpmArchString(s) {
+-    return ['x86_64', 'armv7hl', 'aarch64', 'ppc64le'].includes(s);
++    return ['x86_64', 'armv7hl', 'aarch64', 'ppc64le', 'riscv64'].includes(s);
+ }
+diff --git a/build/linux/rpm/types.ts b/build/linux/rpm/types.ts
+index 3f3c3f5..d94537e 100644
+--- a/build/linux/rpm/types.ts
++++ b/build/linux/rpm/types.ts
+@@ -5,6 +5,6 @@
+ 
+-export type RpmArchString = 'x86_64' | 'armv7hl' | 'aarch64' | 'ppc64le';
++export type RpmArchString = 'x86_64' | 'armv7hl' | 'aarch64' | 'ppc64le' | 'riscv64';
+ 
+ export function isRpmArchString(s: string): s is RpmArchString {
+-	return ['x86_64', 'armv7hl', 'aarch64', 'ppc64le'].includes(s);
++	return ['x86_64', 'armv7hl', 'aarch64', 'ppc64le', 'riscv64'].includes(s);
+ }
+diff --git a/cli/src/update_service.rs b/cli/src/update_service.rs
+index bcab676..29228cb 100644
+--- a/cli/src/update_service.rs
++++ b/cli/src/update_service.rs
+@@ -219,2 +219,3 @@ pub enum Platform {
+ 	LinuxPPC64LELegacy,
++	LinuxRISCV64,
+ 	DarwinX64,
+@@ -233,2 +234,3 @@ impl Platform {
+ 			Platform::LinuxPPC64LE => Some("linux-ppc64le".to_owned()),
++			Platform::LinuxRISCV64 => Some("linux-riscv64".to_owned()),
+ 			Platform::DarwinX64 => Some("darwin".to_owned()),
+@@ -253,2 +255,3 @@ impl Platform {
+ 			Platform::LinuxPPC64LELegacy => "server-linux-legacy-ppc64le",
++			Platform::LinuxRISCV64 => "server-linux-riscv64",
+ 			Platform::DarwinX64 => "server-darwin",
+@@ -274,2 +277,3 @@ impl Platform {
+ 			Platform::LinuxPPC64LELegacy => "cli-linux-ppc64le",
++			Platform::LinuxRISCV64 => "cli-linux-riscv64",
+ 			Platform::DarwinX64 => "cli-darwin-x64",
+@@ -308,2 +312,4 @@ impl Platform {
+ 			Some(Platform::LinuxPPC64LE)
++		} else if cfg!(all(target_os = "linux", target_arch = "riscv64")) {
++			Some(Platform::LinuxRISCV64)
+ 		} else if cfg!(all(target_os = "macos", target_arch = "x86_64")) {
+@@ -337,2 +343,3 @@ impl fmt::Display for Platform {
+ 			Platform::LinuxPPC64LELegacy => "LinuxPPC64LELegacy",
++			Platform::LinuxRISCV64 => "LinuxRISCV64",
+ 			Platform::DarwinX64 => "DarwinX64",
+diff --git a/cli/src/util/prereqs.rs b/cli/src/util/prereqs.rs
+index 4827a47..137a257 100644
+--- a/cli/src/util/prereqs.rs
++++ b/cli/src/util/prereqs.rs
+@@ -88,2 +88,4 @@ impl PreReqChecker {
+ 					Platform::LinuxPPC64LE
++				} else if cfg!(target_arch = "riscv64") {
++					Platform::LinuxRISCV64
+ 				} else {
+diff --git a/resources/server/bin/helpers/check-requirements-linux.sh b/resources/server/bin/helpers/check-requirements-linux.sh
+index 00dd3e2..91c9d20 100644
+--- a/resources/server/bin/helpers/check-requirements-linux.sh
++++ b/resources/server/bin/helpers/check-requirements-linux.sh
+@@ -57,2 +57,3 @@ case $ARCH in
+     ppc64el) LDCONFIG_ARCH="64bit";;
++	riscv64) LDCONFIG_ARCH="RISC-V";;
+ esac
+diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts
+index 004df84..fb2acc7 100644
+--- a/src/vs/platform/extensionManagement/common/extensionManagement.ts
++++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts
+@@ -42,2 +42,3 @@ export function TargetPlatformToString(targetPlatform: TargetPlatform) {
+ 		case TargetPlatform.LINUX_PPC64LE: return 'Linux PowerPC64';
++		case TargetPlatform.LINUX_RISCV64: return 'Linux RISC-V 64';
+ 
+@@ -66,2 +67,3 @@ export function toTargetPlatform(targetPlatform: string): TargetPlatform {
+ 		case TargetPlatform.LINUX_PPC64LE: return TargetPlatform.LINUX_PPC64LE;
++		case TargetPlatform.LINUX_RISCV64: return TargetPlatform.LINUX_RISCV64;
+ 
+@@ -104,2 +106,5 @@ export function getTargetPlatform(platform: Platform | 'alpine', arch: string |
+ 			}
++			if (arch === 'riscv64') {
++				return TargetPlatform.LINUX_RISCV64;
++			}
+ 			return TargetPlatform.UNKNOWN;
+diff --git a/src/vs/platform/extensions/common/extensions.ts b/src/vs/platform/extensions/common/extensions.ts
+index a7d6298..a7aa2bb 100644
+--- a/src/vs/platform/extensions/common/extensions.ts
++++ b/src/vs/platform/extensions/common/extensions.ts
+@@ -295,2 +295,3 @@ export const enum TargetPlatform {
+ 	LINUX_PPC64LE = 'linux-ppc64le',
++	LINUX_RISCV64 = 'linux-riscv64',
+ 

patches/linux/arch-3-loong64.patch

@@ -0,0 +1,96 @@
+diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
+index df4fda0c898..ce8f21bbc0e 100644
+--- a/build/gulpfile.reh.js
++++ b/build/gulpfile.reh.js
+@@ -52,2 +52,3 @@ const BUILD_TARGETS = [
+ 	{ platform: 'linux', arch: 'riscv64' },
++	{ platform: 'linux', arch: 'loong64' },
+ 	{ platform: 'alpine', arch: 'arm64' },
+diff --git a/build/gulpfile.scan.js b/build/gulpfile.scan.js
+index 0eafadc1fff..3c1d6fb5bfc 100644
+--- a/build/gulpfile.scan.js
++++ b/build/gulpfile.scan.js
+@@ -28,2 +28,3 @@ const BUILD_TARGETS = [
+ 	{ platform: 'linux', arch: 'riscv64' },
++	{ platform: 'linux', arch: 'loong64' },
+ ];
+diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
+index b208d700f2c..4be8f93f704 100644
+--- a/build/gulpfile.vscode.js
++++ b/build/gulpfile.vscode.js
+@@ -489,2 +489,3 @@ const BUILD_TARGETS = [
+ 	{ platform: 'linux', arch: 'riscv64' },
++	{ platform: 'linux', arch: 'loong64' },
+ ];
+diff --git a/cli/src/update_service.rs b/cli/src/update_service.rs
+index 29228cb4235..c1163029377 100644
+--- a/cli/src/update_service.rs
++++ b/cli/src/update_service.rs
+@@ -220,2 +220,3 @@ pub enum Platform {
+ 	LinuxRISCV64,
++	LinuxLoong64,
+ 	DarwinX64,
+@@ -235,2 +236,3 @@ impl Platform {
+ 			Platform::LinuxRISCV64 => Some("linux-riscv64".to_owned()),
++			Platform::LinuxLoong64 => Some("linux-loong64".to_owned()),
+ 			Platform::DarwinX64 => Some("darwin".to_owned()),
+@@ -256,2 +258,3 @@ impl Platform {
+ 			Platform::LinuxRISCV64 => "server-linux-riscv64",
++			Platform::LinuxLoong64 => "server-linux-loong64",
+ 			Platform::DarwinX64 => "server-darwin",
+@@ -278,2 +281,3 @@ impl Platform {
+ 			Platform::LinuxRISCV64 => "cli-linux-riscv64",
++			Platform::LinuxLoong64 => "cli-linux-loong64",
+ 			Platform::DarwinX64 => "cli-darwin-x64",
+@@ -314,2 +318,4 @@ impl Platform {
+ 			Some(Platform::LinuxRISCV64)
++		} else if cfg!(all(target_os = "linux", target_arch = "loongarch64")) {
++			Some(Platform::LinuxLoong64)
+ 		} else if cfg!(all(target_os = "macos", target_arch = "x86_64")) {
+@@ -344,2 +350,3 @@ impl fmt::Display for Platform {
+ 			Platform::LinuxRISCV64 => "LinuxRISCV64",
++			Platform::LinuxLoong64 => "LinuxLoong64",
+ 			Platform::DarwinX64 => "DarwinX64",
+diff --git a/cli/src/util/prereqs.rs b/cli/src/util/prereqs.rs
+index 137a2570130..8f1e20c2aa9 100644
+--- a/cli/src/util/prereqs.rs
++++ b/cli/src/util/prereqs.rs
+@@ -90,2 +90,4 @@ impl PreReqChecker {
+ 					Platform::LinuxRISCV64
++				} else if cfg!(target_arch = "loongarch64") {
++					Platform::LinuxLoong64
+ 				} else {
+diff --git a/resources/server/bin/helpers/check-requirements-linux.sh b/resources/server/bin/helpers/check-requirements-linux.sh
+index 91c9d203387..7776dbcbc24 100644
+--- a/resources/server/bin/helpers/check-requirements-linux.sh
++++ b/resources/server/bin/helpers/check-requirements-linux.sh
+@@ -58,2 +58,3 @@ case $ARCH in
+ 	riscv64) LDCONFIG_ARCH="RISC-V";;
++    loongarch64) LDCONFIG_ARCH="double-float";;
+ esac
+diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts
+index 03e78ca3116..8e59218d7ad 100644
+--- a/src/vs/platform/extensionManagement/common/extensionManagement.ts
++++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts
+@@ -44,2 +44,3 @@ export function TargetPlatformToString(targetPlatform: TargetPlatform) {
+ 		case TargetPlatform.LINUX_RISCV64: return 'Linux RISC-V 64';
++		case TargetPlatform.LINUX_LOONG64: return 'Linux Loong64';
+ 
+@@ -69,2 +70,3 @@ export function toTargetPlatform(targetPlatform: string): TargetPlatform {
+ 		case TargetPlatform.LINUX_RISCV64: return TargetPlatform.LINUX_RISCV64;
++		case TargetPlatform.LINUX_LOONG64: return TargetPlatform.LINUX_LOONG64;
+ 
+@@ -113,2 +115,5 @@ export function getTargetPlatform(platform: Platform | 'alpine', arch: string |
+ 			}
++			if (arch === 'loong64') {
++				return TargetPlatform.LINUX_LOONG64;
++			}
+ 			return TargetPlatform.UNKNOWN;
+diff --git a/src/vs/platform/extensions/common/extensions.ts b/src/vs/platform/extensions/common/extensions.ts
+index a7aa2bb23bf..a4d076ce596 100644
+--- a/src/vs/platform/extensions/common/extensions.ts
++++ b/src/vs/platform/extensions/common/extensions.ts
+@@ -296,2 +296,3 @@ export const enum TargetPlatform {
+ 	LINUX_RISCV64 = 'linux-riscv64',
++	LINUX_LOONG64 = 'linux-loong64',
+ 

patches/linux/arch-4-s390x.patch

@@ -0,0 +1,430 @@
+diff --git a/build/azure-pipelines/linux/setup-env.sh b/build/azure-pipelines/linux/setup-env.sh
+index fbe67b0..5b2f5d8 100755
+--- a/build/azure-pipelines/linux/setup-env.sh
++++ b/build/azure-pipelines/linux/setup-env.sh
+@@ -86,2 +86,14 @@ elif [ "$npm_config_arch" == "arm" ]; then
+ 	export VSCODE_REMOTE_LDFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/powerpc64le-linux-gnu/sysroot -L$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/powerpc64le-linux-gnu/sysroot/usr/lib/powerpc64le-linux-gnu -L$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/powerpc64le-linux-gnu/sysroot/lib/powerpc64le-linux-gnu"
++elif [ "$npm_config_arch" == "s390x" ]; then
++	# Set compiler toolchain for client native modules
++	export CC=$VSCODE_SYSROOT_DIR/s390x-linux-gnu/bin/s390x-linux-gnu-gcc
++	export CXX=$VSCODE_SYSROOT_DIR/s390x-linux-gnu/bin/s390x-linux-gnu-g++
++	export CXXFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/s390x-linux-gnu/s390x-linux-gnu/sysroot"
++	export LDFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/s390x-linux-gnu/s390x-linux-gnu/sysroot -L$VSCODE_SYSROOT_DIR/s390x-linux-gnu/s390x-linux-gnu/sysroot/usr/lib/s390x-linux-gnu -L$VSCODE_SYSROOT_DIR/s390x-linux-gnu/s390x-linux-gnu/sysroot/lib/s390x-linux-gnu"
++
++	# Set compiler toolchain for remote server
++	export VSCODE_REMOTE_CC=$VSCODE_SYSROOT_DIR/s390x-linux-gnu/bin/s390x-linux-gnu-gcc
++	export VSCODE_REMOTE_CXX=$VSCODE_SYSROOT_DIR/s390x-linux-gnu/bin/s390x-linux-gnu-g++
++	export VSCODE_REMOTE_CXXFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/s390x-linux-gnu/s390x-linux-gnu/sysroot"
++	export VSCODE_REMOTE_LDFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/s390x-linux-gnu/s390x-linux-gnu/sysroot -L$VSCODE_SYSROOT_DIR/s390x-linux-gnu/s390x-linux-gnu/sysroot/usr/lib/s390x-linux-gnu -L$VSCODE_SYSROOT_DIR/s390x-linux-gnu/s390x-linux-gnu/sysroot/lib/s390x-linux-gnu"
+ fi
+diff --git a/build/checksums/vscode-sysroot.txt b/build/checksums/vscode-sysroot.txt
+index 0b5f38c..9f3b02b 100644
+--- a/build/checksums/vscode-sysroot.txt
++++ b/build/checksums/vscode-sysroot.txt
+@@ -7 +7,2 @@
+ fa8176d27be18bb0eeb7f55b0fa22255050b430ef68c29136599f02976eb0b1b  powerpc64le-linux-gnu-glibc-2.28.tar.gz
++7055f3d40e7195fb1e13f0fbaf5ffadf781bddaca5fd5e0d9972f4157a203fb5  s390x-linux-gnu-glibc-2.28.tar.gz
+diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
+index d0770d6..8c83c13 100644
+--- a/build/gulpfile.reh.js
++++ b/build/gulpfile.reh.js
+@@ -53,2 +53,3 @@ const BUILD_TARGETS = [
+ 	{ platform: 'linux', arch: 'loong64' },
++	{ platform: 'linux', arch: 's390x' },
+ 	{ platform: 'alpine', arch: 'arm64' },
+diff --git a/build/gulpfile.scan.js b/build/gulpfile.scan.js
+index cbcdddb..274d889 100644
+--- a/build/gulpfile.scan.js
++++ b/build/gulpfile.scan.js
+@@ -29,2 +29,3 @@ const BUILD_TARGETS = [
+ 	{ platform: 'linux', arch: 'loong64' },
++	{ platform: 'linux', arch: 's390x' },
+ ];
+diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
+index 95f2cf0..7395ba4 100644
+--- a/build/gulpfile.vscode.js
++++ b/build/gulpfile.vscode.js
+@@ -498,2 +498,3 @@ const BUILD_TARGETS = [
+ 	{ platform: 'linux', arch: 'loong64' },
++	{ platform: 'linux', arch: 's390x' },
+ ];
+diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js
+index fb0e5a4..264cec1 100644
+--- a/build/gulpfile.vscode.linux.js
++++ b/build/gulpfile.vscode.linux.js
+@@ -31,3 +31,3 @@ const linuxPackageRevision = Math.floor(new Date().getTime() / 1000);
+ function getDebPackageArch(arch) {
+-	return { x64: 'amd64', armhf: 'armhf', arm64: 'arm64', ppc64le: 'ppc64el', riscv64: 'riscv64' }[arch];
++	return { x64: 'amd64', armhf: 'armhf', arm64: 'arm64', ppc64le: 'ppc64el', riscv64: 'riscv64', s390x: 's390x' }[arch];
+ }
+@@ -143,3 +143,3 @@ function getRpmBuildPath(rpmArch) {
+ function getRpmPackageArch(arch) {
+-	return { x64: 'x86_64', armhf: 'armv7hl', arm64: 'aarch64', ppc64le: 'ppc64le', riscv64: 'riscv64' }[arch];
++	return { x64: 'x86_64', armhf: 'armv7hl', arm64: 'aarch64', ppc64le: 'ppc64le', riscv64: 'riscv64', s390x: 's390x' }[arch];
+ }
+@@ -307,2 +307,3 @@ const BUILD_TARGETS = [
+ 	{ arch: 'riscv64' },
++	{ arch: 's390x' },
+ ];
+diff --git a/build/linux/debian/calculate-deps.js b/build/linux/debian/calculate-deps.js
+index 57934e6..b97d275 100644
+--- a/build/linux/debian/calculate-deps.js
++++ b/build/linux/debian/calculate-deps.js
+@@ -57,2 +57,5 @@ function calculatePackageDeps(binaryPath, arch, chromiumSysroot, vscodeSysroot)
+ 			break;
++		case 's390x':
++			cmd.push(`-l${chromiumSysroot}/usr/lib/s390x-linux-gnu`, `-l${chromiumSysroot}/lib/s390x-linux-gnu`, `-l${vscodeSysroot}/usr/lib/s390x-linux-gnu`, `-l${vscodeSysroot}/lib/s390x-linux-gnu`);
++			break;
+     }
+diff --git a/build/linux/debian/calculate-deps.ts b/build/linux/debian/calculate-deps.ts
+index c44e241..5a6e9b4 100644
+--- a/build/linux/debian/calculate-deps.ts
++++ b/build/linux/debian/calculate-deps.ts
+@@ -73,2 +73,8 @@ function calculatePackageDeps(binaryPath: string, arch: DebianArchString, chromi
+ 			break;
++		case 's390x':
++			cmd.push(`-l${chromiumSysroot}/usr/lib/s390x-linux-gnu`,
++				`-l${chromiumSysroot}/lib/s390x-linux-gnu`,
++				`-l${vscodeSysroot}/usr/lib/s390x-linux-gnu`,
++				`-l${vscodeSysroot}/lib/s390x-linux-gnu`);
++			break;
+ 	}
+diff --git a/build/linux/debian/dep-lists.js b/build/linux/debian/dep-lists.js
+index 306d91e..64377e3 100644
+--- a/build/linux/debian/dep-lists.js
++++ b/build/linux/debian/dep-lists.js
+@@ -218,2 +218,42 @@ exports.referenceGeneratedDepsByArch = {
+     ],
++    's390x': [
++        'ca-certificates',
++        'libatomic1',
++        'libasound2 (>= 1.0.17)',
++        'libatk-bridge2.0-0 (>= 2.5.3)',
++        'libatk1.0-0 (>= 2.2.0)',
++        'libatspi2.0-0 (>= 2.9.90)',
++        'libc6 (>= 2.17)',
++        'libc6 (>= 2.28)',
++        'libcairo2 (>= 1.6.0)',
++        'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3',
++        'libdbus-1-3 (>= 1.0.2)',
++        'libdrm2 (>= 2.4.60)',
++        'libexpat1 (>= 2.0.1)',
++        'libgbm1 (>= 17.1.0~rc2)',
++        'libglib2.0-0 (>= 2.16.0)',
++        'libglib2.0-0 (>= 2.39.4)',
++        'libgtk-3-0 (>= 3.9.10)',
++        'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
++        'libnspr4 (>= 2:4.9-2~)',
++        'libnss3 (>= 2:3.22)',
++        'libnss3 (>= 3.26)',
++        'libpango-1.0-0 (>= 1.14.0)',
++        'libsecret-1-0 (>= 0.18)',
++        'libstdc++6 (>= 4.1.1)',
++        'libstdc++6 (>= 5)',
++        'libstdc++6 (>= 5.2)',
++        'libstdc++6 (>= 6)',
++        'libx11-6',
++        'libx11-6 (>= 2:1.4.99.1)',
++        'libxcb1 (>= 1.9.2)',
++        'libxcomposite1 (>= 1:0.4.4-1)',
++        'libxdamage1 (>= 1:1.1)',
++        'libxext6',
++        'libxfixes3',
++        'libxkbcommon0 (>= 0.4.1)',
++        'libxkbfile1',
++        'libxrandr2',
++        'xdg-utils (>= 1.0.2)'
++    ],
+ };
+diff --git a/build/linux/debian/dep-lists.ts b/build/linux/debian/dep-lists.ts
+index 9f29943..aa769ad 100644
+--- a/build/linux/debian/dep-lists.ts
++++ b/build/linux/debian/dep-lists.ts
+@@ -218,2 +218,42 @@ export const referenceGeneratedDepsByArch = {
+ 	],
++	's390x': [
++		'ca-certificates',
++		'libatomic1',
++		'libasound2 (>= 1.0.17)',
++		'libatk-bridge2.0-0 (>= 2.5.3)',
++		'libatk1.0-0 (>= 2.2.0)',
++		'libatspi2.0-0 (>= 2.9.90)',
++		'libc6 (>= 2.17)',
++		'libc6 (>= 2.28)',
++		'libcairo2 (>= 1.6.0)',
++		'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3',
++		'libdbus-1-3 (>= 1.0.2)',
++		'libdrm2 (>= 2.4.60)',
++		'libexpat1 (>= 2.0.1)',
++		'libgbm1 (>= 17.1.0~rc2)',
++		'libglib2.0-0 (>= 2.16.0)',
++		'libglib2.0-0 (>= 2.39.4)',
++		'libgtk-3-0 (>= 3.9.10)',
++		'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
++		'libnspr4 (>= 2:4.9-2~)',
++		'libnss3 (>= 2:3.22)',
++		'libnss3 (>= 3.26)',
++		'libpango-1.0-0 (>= 1.14.0)',
++		'libsecret-1-0 (>= 0.18)',
++		'libstdc++6 (>= 4.1.1)',
++		'libstdc++6 (>= 5)',
++		'libstdc++6 (>= 5.2)',
++		'libstdc++6 (>= 6)',
++		'libx11-6',
++		'libx11-6 (>= 2:1.4.99.1)',
++		'libxcb1 (>= 1.9.2)',
++		'libxcomposite1 (>= 1:0.4.4-1)',
++		'libxdamage1 (>= 1:1.1)',
++		'libxext6',
++		'libxfixes3',
++		'libxkbcommon0 (>= 0.4.1)',
++		'libxkbfile1',
++		'libxrandr2',
++		'xdg-utils (>= 1.0.2)'
++	],
+ };
+diff --git a/build/linux/debian/install-sysroot.js b/build/linux/debian/install-sysroot.js
+index 2cd8f2d..aef739c 100644
+--- a/build/linux/debian/install-sysroot.js
++++ b/build/linux/debian/install-sysroot.js
+@@ -145,2 +145,6 @@ async function getVSCodeSysroot(arch) {
+ 	             break;
++        case 's390x':
++            expectedName = `s390x-linux-gnu${prefix}.tar.gz`;
++            triple = 's390x-linux-gnu';
++            break;
+     }
+diff --git a/build/linux/debian/install-sysroot.ts b/build/linux/debian/install-sysroot.ts
+index d8de38e..53b4866 100644
+--- a/build/linux/debian/install-sysroot.ts
++++ b/build/linux/debian/install-sysroot.ts
+@@ -162,2 +162,6 @@ export async function getVSCodeSysroot(arch: DebianArchString): Promise<string>
+ 			break;
++		case 's390x':
++			expectedName = `s390x-linux-gnu${prefix}.tar.gz`;
++			triple = 's390x-linux-gnu';
++			break;
+ 	}
+diff --git a/build/linux/debian/types.js b/build/linux/debian/types.js
+index ce21d50..2c56b9c 100644
+--- a/build/linux/debian/types.js
++++ b/build/linux/debian/types.js
+@@ -8,3 +8,3 @@ exports.isDebianArchString = isDebianArchString;
+ function isDebianArchString(s) {
+-    return ['amd64', 'armhf', 'arm64', 'ppc64el', 'riscv64'].includes(s);
++    return ['amd64', 'armhf', 'arm64', 'ppc64el', 'riscv64', 's390x'].includes(s);
+ }
+diff --git a/build/linux/debian/types.ts b/build/linux/debian/types.ts
+index e97485e..43f2434 100644
+--- a/build/linux/debian/types.ts
++++ b/build/linux/debian/types.ts
+@@ -5,6 +5,6 @@
+ 
+-export type DebianArchString = 'amd64' | 'armhf' | 'arm64' | 'ppc64el' | 'riscv64';
++export type DebianArchString = 'amd64' | 'armhf' | 'arm64' | 'ppc64el' | 'riscv64' | 's390x';
+ 
+ export function isDebianArchString(s: string): s is DebianArchString {
+-	return ['amd64', 'armhf', 'arm64', 'ppc64el', 'riscv64'].includes(s);
++	return ['amd64', 'armhf', 'arm64', 'ppc64el', 'riscv64', 's390x'].includes(s);
+ }
+diff --git a/build/linux/rpm/dep-lists.ts b/build/linux/rpm/dep-lists.ts
+index 8761e40..1885210 100644
+--- a/build/linux/rpm/dep-lists.ts
++++ b/build/linux/rpm/dep-lists.ts
+@@ -409,2 +409,102 @@ export const referenceGeneratedDepsByArch = {
+ 		'xdg-utils'
++	],
++	"s390x": [
++		'ca-certificates',
++		'ld-linux-x86-64.so.2()(64bit)',
++		'ld-linux-x86-64.so.2(GLIBC_2.3)(64bit)',
++		'ld64.so.2()(64bit)',
++		'ld64.so.2(GLIBC_2.17)(64bit)',
++		'libX11.so.6()(64bit)',
++		'libXcomposite.so.1()(64bit)',
++		'libXdamage.so.1()(64bit)',
++		'libXext.so.6()(64bit)',
++		'libXfixes.so.3()(64bit)',
++		'libXrandr.so.2()(64bit)',
++		'libasound.so.2()(64bit)',
++		'libasound.so.2(ALSA_0.9)(64bit)',
++		'libasound.so.2(ALSA_0.9.0rc4)(64bit)',
++		'libatk-1.0.so.0()(64bit)',
++		'libatk-bridge-2.0.so.0()(64bit)',
++		'libatspi.so.0()(64bit)',
++		'libc.so.6()(64bit)',
++		'libc.so.6(GLIBC_2.14)(64bit)',
++		'libc.so.6(GLIBC_2.17)(64bit)',
++		'libc.so.6(GLIBC_2.2.5)(64bit)',
++		'libc.so.6(GLIBC_2.28)(64bit)',
++		'libc.so.6(GLIBC_2.4)(64bit)',
++		'libc.so.6(GLIBC_2.9)(64bit)',
++		'libcairo.so.2()(64bit)',
++		'libcups.so.2()(64bit)',
++		'libcurl.so.4()(64bit)',
++		'libdbus-1.so.3()(64bit)',
++		'libdbus-1.so.3(LIBDBUS_1_3)(64bit)',
++		'libdl.so.2()(64bit)',
++		'libdl.so.2(GLIBC_2.17)(64bit)',
++		'libdrm.so.2()(64bit)',
++		'libexpat.so.1()(64bit)',
++		'libgbm.so.1()(64bit)',
++		'libgcc_s.so.1()(64bit)',
++		'libgcc_s.so.1(GCC_3.0)(64bit)',
++		'libgcc_s.so.1(GCC_3.4.4)(64bit)',
++		'libgio-2.0.so.0()(64bit)',
++		'libglib-2.0.so.0()(64bit)',
++		'libgobject-2.0.so.0()(64bit)',
++		'libgssapi_krb5.so.2()(64bit)',
++		'libgssapi_krb5.so.2(gssapi_krb5_2_MIT)(64bit)',
++		'libgtk-3.so.0()(64bit)',
++		'libkrb5.so.3()(64bit)',
++		'libkrb5.so.3(krb5_3_MIT)(64bit)',
++		'libm.so.6()(64bit)',
++		'libm.so.6(GLIBC_2.17)(64bit)',
++		'libm.so.6(GLIBC_2.2.5)(64bit)',
++		'libm.so.6(GLIBC_2.27)(64bit)',
++		'libnspr4.so()(64bit)',
++		'libnss3.so()(64bit)',
++		'libnss3.so(NSS_3.11)(64bit)',
++		'libnss3.so(NSS_3.12)(64bit)',
++		'libnss3.so(NSS_3.12.1)(64bit)',
++		'libnss3.so(NSS_3.2)(64bit)',
++		'libnss3.so(NSS_3.22)(64bit)',
++		'libnss3.so(NSS_3.3)(64bit)',
++		'libnss3.so(NSS_3.30)(64bit)',
++		'libnss3.so(NSS_3.4)(64bit)',
++		'libnss3.so(NSS_3.5)(64bit)',
++		'libnss3.so(NSS_3.9.2)(64bit)',
++		'libnssutil3.so()(64bit)',
++		'libnssutil3.so(NSSUTIL_3.12.3)(64bit)',
++		'libpango-1.0.so.0()(64bit)',
++		'libpthread.so.0()(64bit)',
++		'libpthread.so.0(GLIBC_2.17)(64bit)',
++		'libpthread.so.0(GLIBC_2.2.5)(64bit)',
++		'libpthread.so.0(GLIBC_2.3.2)(64bit)',
++		'libpthread.so.0(GLIBC_2.3.3)(64bit)',
++		'libsmime3.so()(64bit)',
++		'libsmime3.so(NSS_3.10)(64bit)',
++		'libsmime3.so(NSS_3.2)(64bit)',
++		'libssl3.so(NSS_3.28)(64bit)',
++		'libstdc++.so.6()(64bit)',
++		'libstdc++.so.6(CXXABI_1.3)(64bit)',
++		'libstdc++.so.6(CXXABI_1.3.5)(64bit)',
++		'libstdc++.so.6(CXXABI_1.3.8)(64bit)',
++		'libstdc++.so.6(CXXABI_1.3.9)(64bit)',
++		'libstdc++.so.6(GLIBCXX_3.4)(64bit)',
++		'libstdc++.so.6(GLIBCXX_3.4.11)(64bit)',
++		'libstdc++.so.6(GLIBCXX_3.4.14)(64bit)',
++		'libstdc++.so.6(GLIBCXX_3.4.15)(64bit)',
++		'libstdc++.so.6(GLIBCXX_3.4.18)(64bit)',
++		'libstdc++.so.6(GLIBCXX_3.4.19)(64bit)',
++		'libstdc++.so.6(GLIBCXX_3.4.20)(64bit)',
++		'libstdc++.so.6(GLIBCXX_3.4.21)(64bit)',
++		'libstdc++.so.6(GLIBCXX_3.4.22)(64bit)',
++		'libstdc++.so.6(GLIBCXX_3.4.5)(64bit)',
++		'libstdc++.so.6(GLIBCXX_3.4.9)(64bit)',
++		'libutil.so.1()(64bit)',
++		'libutil.so.1(GLIBC_2.2.5)(64bit)',
++		'libxcb.so.1()(64bit)',
++		'libxkbcommon.so.0()(64bit)',
++		'libxkbcommon.so.0(V_0.5.0)(64bit)',
++		'libxkbfile.so.1()(64bit)',
++		'rpmlib(FileDigests) <= 4.6.0-1',
++		'rtld(GNU_HASH)',
++		'xdg-utils'
+ 	]
+diff --git a/build/linux/rpm/types.js b/build/linux/rpm/types.js
+index a20b9c2..7b58961 100644
+--- a/build/linux/rpm/types.js
++++ b/build/linux/rpm/types.js
+@@ -8,3 +8,3 @@ exports.isRpmArchString = isRpmArchString;
+ function isRpmArchString(s) {
+-    return ['x86_64', 'armv7hl', 'aarch64', 'ppc64le', 'riscv64'].includes(s);
++    return ['x86_64', 'armv7hl', 'aarch64', 'ppc64le', 'riscv64', 's390x'].includes(s);
+ }
+diff --git a/build/linux/rpm/types.ts b/build/linux/rpm/types.ts
+index c6a01da..3f3c3f5 100644
+--- a/build/linux/rpm/types.ts
++++ b/build/linux/rpm/types.ts
+@@ -5,6 +5,6 @@
+ 
+-export type RpmArchString = 'x86_64' | 'armv7hl' | 'aarch64' | 'ppc64le' | 'riscv64';
++export type RpmArchString = 'x86_64' | 'armv7hl' | 'aarch64' | 'ppc64le' | 'riscv64' | 's390x';
+ 
+ export function isRpmArchString(s: string): s is RpmArchString {
+-	return ['x86_64', 'armv7hl', 'aarch64', 'ppc64le', 'riscv64'].includes(s);
++	return ['x86_64', 'armv7hl', 'aarch64', 'ppc64le', 'riscv64', 's390x'].includes(s);
+ }
+diff --git a/cli/src/update_service.rs b/cli/src/update_service.rs
+index 9033914..bcab676 100644
+--- a/cli/src/update_service.rs
++++ b/cli/src/update_service.rs
+@@ -221,2 +221,3 @@ pub enum Platform {
+ 	LinuxLoong64,
++	LinuxS390X,
+ 	DarwinX64,
+@@ -237,2 +238,3 @@ impl Platform {
+ 			Platform::LinuxLoong64 => Some("linux-loong64".to_owned()),
++			Platform::LinuxS390X => Some("linux-s390x".to_owned()),
+ 			Platform::DarwinX64 => Some("darwin".to_owned()),
+@@ -259,2 +261,3 @@ impl Platform {
+ 			Platform::LinuxLoong64 => "server-linux-loong64",
++			Platform::LinuxS390X => "server-linux-s390x",
+ 			Platform::DarwinX64 => "server-darwin",
+@@ -282,2 +285,3 @@ impl Platform {
+ 			Platform::LinuxLoong64 => "cli-linux-loong64",
++			Platform::LinuxS390X => "cli-linux-s390x",
+ 			Platform::DarwinX64 => "cli-darwin-x64",
+@@ -320,2 +324,4 @@ impl Platform {
+ 			Some(Platform::LinuxLoong64)
++		} else if cfg!(all(target_os = "linux", target_arch = "s390x")) {
++			Some(Platform::LinuxS390X)
+ 		} else if cfg!(all(target_os = "macos", target_arch = "x86_64")) {
+@@ -351,2 +357,3 @@ impl fmt::Display for Platform {
+ 			Platform::LinuxLoong64 => "LinuxLoong64",
++			Platform::LinuxS390X => "LinuxRISCV64",
+ 			Platform::DarwinX64 => "DarwinX64",
+diff --git a/cli/src/util/prereqs.rs b/cli/src/util/prereqs.rs
+index e0fba27..4827a47 100644
+--- a/cli/src/util/prereqs.rs
++++ b/cli/src/util/prereqs.rs
+@@ -92,2 +92,4 @@ impl PreReqChecker {
+ 					Platform::LinuxLoong64
++				} else if cfg!(target_arch = "s390x") {
++					Platform::LinuxS390X
+ 				} else {
+diff --git a/resources/server/bin/helpers/check-requirements-linux.sh b/resources/server/bin/helpers/check-requirements-linux.sh
+index 8ef07a2..00dd3e2 100644
+--- a/resources/server/bin/helpers/check-requirements-linux.sh
++++ b/resources/server/bin/helpers/check-requirements-linux.sh
+@@ -59,2 +59,3 @@ case $ARCH in
+     loongarch64) LDCONFIG_ARCH="double-float";;
++    s390x)   LDCONFIG_ARCH="64bit";;
+ esac
+diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts
+index ea7b30d..004df84 100644
+--- a/src/vs/platform/extensionManagement/common/extensionManagement.ts
++++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts
+@@ -44,2 +44,3 @@ export function TargetPlatformToString(targetPlatform: TargetPlatform) {
+ 		case TargetPlatform.LINUX_LOONG64: return 'Linux Loong64';
++		case TargetPlatform.LINUX_S390X: return 'Linux S390X';
+ 
+@@ -70,2 +71,3 @@ export function toTargetPlatform(targetPlatform: string): TargetPlatform {
+ 		case TargetPlatform.LINUX_LOONG64: return TargetPlatform.LINUX_LOONG64;
++		case TargetPlatform.LINUX_S390X: return TargetPlatform.LINUX_S390X;
+ 
+@@ -114,2 +116,5 @@ export function getTargetPlatform(platform: Platform | 'alpine', arch: string |
+ 			}
++			if (arch === 's390x') {
++				return TargetPlatform.LINUX_S390X;
++			}
+ 			return TargetPlatform.UNKNOWN;
+diff --git a/src/vs/platform/extensions/common/extensions.ts b/src/vs/platform/extensions/common/extensions.ts
+index 5973d4d..a7d6298 100644
+--- a/src/vs/platform/extensions/common/extensions.ts
++++ b/src/vs/platform/extensions/common/extensions.ts
+@@ -297,2 +297,3 @@ export const enum TargetPlatform {
+ 	LINUX_LOONG64 = 'linux-loong64',
++	LINUX_S390X = 'linux-s390x',
+ 

patches/linux/client/disable-remote.patch

@@ -1,10 +1,14 @@
-diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
-index 72dd74f..94d4957 100644
---- a/build/npm/postinstall.js
-+++ b/build/npm/postinstall.js
-@@ -86,4 +86,3 @@ for (let dir of dirs) {
- 
--	if (/^(.build\/distro\/npm\/)?remote/.test(dir) && process.platform === 'win32' && (process.arch === 'arm64' || process.env['npm_config_arch'] === 'arm64')) {
--		// windows arm: do not execute `yarn` on remote folder
-+	if (/^(.build\/distro\/npm\/)?remote/.test(dir)) {
- 		continue;
+diff --git a/build/npm/dirs.js b/build/npm/dirs.js
+index b9645e6..22f3450 100644
+--- a/build/npm/dirs.js
++++ b/build/npm/dirs.js
+@@ -47,4 +47,2 @@ const dirs = [
+ 	'extensions/vscode-test-resolver',
+-	'remote',
+-	'remote/web',
+ 	'test/automation',
+@@ -59,4 +57,2 @@ if (fs.existsSync(`${__dirname}/../../.build/distro/npm`)) {
+ 	dirs.push('.build/distro/npm');
+-	dirs.push('.build/distro/npm/remote');
+-	dirs.push('.build/distro/npm/remote/web');
+ }

patches/linux/client/use-n16-libs.patch

@@ -1,9 +0,0 @@
-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",

patches/linux/fix-build.patch

@@ -1,39 +1,39 @@
 diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js
-index 8c2b62f..843e8d4 100644
+index fb0e5a4..412a6cc 100644
 --- a/build/gulpfile.vscode.linux.js
 +++ b/build/gulpfile.vscode.linux.js
-@@ -187,2 +187,3 @@ function prepareRpmPackage(arch) {
+@@ -197,2 +197,3 @@ function prepareRpmPackage(arch) {
  		const spec = code.pipe(es.through(
 +			null,
  			async function () {
-@@ -302,4 +303,3 @@ BUILD_TARGETS.forEach(({ arch }) => {
- 	const prepareDebTask = task.define(`vscode-linux-${arch}-prepare-deb`, task.series(util.rimraf(`.build/linux/deb/${debArch}`), prepareDebPackage(arch)));
+@@ -312,4 +313,3 @@ BUILD_TARGETS.forEach(({ arch }) => {
+ 	const prepareDebTask = task.define(`vscode-linux-${arch}-prepare-deb`, task.series(rimraf(`.build/linux/deb/${debArch}`), prepareDebPackage(arch)));
 -	gulp.task(prepareDebTask);
 -	const buildDebTask = task.define(`vscode-linux-${arch}-build-deb`, buildDebPackage(arch));
 +	const buildDebTask = task.define(`vscode-linux-${arch}-build-deb`, task.series(prepareDebTask, buildDebPackage(arch)));
  	gulp.task(buildDebTask);
-@@ -308,4 +308,3 @@ BUILD_TARGETS.forEach(({ arch }) => {
- 	const prepareRpmTask = task.define(`vscode-linux-${arch}-prepare-rpm`, task.series(util.rimraf(`.build/linux/rpm/${rpmArch}`), prepareRpmPackage(arch)));
+@@ -318,4 +318,3 @@ BUILD_TARGETS.forEach(({ arch }) => {
+ 	const prepareRpmTask = task.define(`vscode-linux-${arch}-prepare-rpm`, task.series(rimraf(`.build/linux/rpm/${rpmArch}`), prepareRpmPackage(arch)));
 -	gulp.task(prepareRpmTask);
 -	const buildRpmTask = task.define(`vscode-linux-${arch}-build-rpm`, buildRpmPackage(arch));
 +	const buildRpmTask = task.define(`vscode-linux-${arch}-build-rpm`, task.series(prepareRpmTask, buildRpmPackage(arch)));
  	gulp.task(buildRpmTask);
 diff --git a/build/linux/dependencies-generator.js b/build/linux/dependencies-generator.js
-index bff0c9a..57c12e0 100644
+index 80b11b3..0a0ca71 100644
 --- a/build/linux/dependencies-generator.js
 +++ b/build/linux/dependencies-generator.js
 @@ -24,3 +24,3 @@ const product = require("../../product.json");
  // are valid, are in dep-lists.ts
 -const FAIL_BUILD_FOR_NEW_DEPENDENCIES = true;
 +const FAIL_BUILD_FOR_NEW_DEPENDENCIES = false;
- // Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/122.0.6261.156:chrome/installer/linux/BUILD.gn;l=64-80
-@@ -56,3 +56,3 @@ async function getDependencies(packageType, buildDir, applicationName, arch) {
+ // Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/128.0.6613.186:chrome/installer/linux/BUILD.gn;l=64-80
+@@ -57,3 +57,3 @@ async function getDependencies(packageType, buildDir, applicationName, arch) {
      // Add the tunnel binary.
 -    files.push(path.join(buildDir, 'bin', product.tunnelApplicationName));
 +    // files.push(path.join(buildDir, 'bin', product.tunnelApplicationName));
      // Add the main executable.
 diff --git a/build/linux/dependencies-generator.ts b/build/linux/dependencies-generator.ts
-index 226310e..e75f652 100644
+index 3163aee..dca1845 100644
 --- a/build/linux/dependencies-generator.ts
 +++ b/build/linux/dependencies-generator.ts
 @@ -25,3 +25,3 @@ import product = require('../../product.json');
@@ -41,17 +41,9 @@ index 226310e..e75f652 100644
 -const FAIL_BUILD_FOR_NEW_DEPENDENCIES: boolean = true;
 +const FAIL_BUILD_FOR_NEW_DEPENDENCIES: boolean = false;
  
-@@ -61,3 +61,3 @@ export async function getDependencies(packageType: 'deb' | 'rpm', buildDir: stri
+@@ -62,3 +62,3 @@ export async function getDependencies(packageType: 'deb' | 'rpm', buildDir: stri
  	// Add the tunnel binary.
 -	files.push(path.join(buildDir, 'bin', product.tunnelApplicationName));
 +	// files.push(path.join(buildDir, 'bin', product.tunnelApplicationName));
  	// Add the main executable.
-diff --git a/resources/linux/rpm/code.spec.template b/resources/linux/rpm/code.spec.template
-index c9e57db..bda2604 100644
---- a/resources/linux/rpm/code.spec.template
-+++ b/resources/linux/rpm/code.spec.template
-@@ -87 +87,3 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
- %{_datadir}/zsh/site-functions/_%{name}
-+
-+%config(noreplace) /usr/share/%{name}/resources/app/product.json
-\ No newline at end of file
+  

patches/linux/fix-reh-bootstrap.patch

@@ -0,0 +1,27 @@
+diff --git a/src/bootstrap-esm.ts b/src/bootstrap-esm.ts
+index f2cf101..d974f65 100644
+--- a/src/bootstrap-esm.ts
++++ b/src/bootstrap-esm.ts
+@@ -8,3 +8,3 @@ import * as fs from 'fs';
+ import { fileURLToPath } from 'url';
+-import { createRequire, register } from 'node:module';
++import * as Module from 'node:module';
+ import { product, pkg } from './bootstrap-meta.js';
+@@ -14,3 +14,4 @@ import { INLSConfiguration } from './vs/nls.js';
+ 
+-const require = createRequire(import.meta.url);
++// @ts-ignore
++const require = Module.createRequire(import.meta.url);
+ const __dirname = path.dirname(fileURLToPath(import.meta.url));
+@@ -18,3 +19,4 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url));
+ // Install a hook to module resolution to map 'fs' to 'original-fs'
+-if (process.env['ELECTRON_RUN_AS_NODE'] || process.versions['electron']) {
++// @ts-ignore
++if (Module.register && (process.env['ELECTRON_RUN_AS_NODE'] || process.versions['electron'])) {
+ 	const jsCode = `
+@@ -33,3 +35,4 @@ if (process.env['ELECTRON_RUN_AS_NODE'] || process.versions['electron']) {
+ 	}`;
+-	register(`data:text/javascript;base64,${Buffer.from(jsCode).toString('base64')}`, import.meta.url);
++	// @ts-ignore
++	Module.register(`data:text/javascript;base64,${Buffer.from(jsCode).toString('base64')}`, import.meta.url);
+ }

patches/linux/reh-node16.patch

@@ -1,70 +0,0 @@
-diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
-index c2b81d0..2e94d99 100644
---- a/build/gulpfile.reh.js
-+++ b/build/gulpfile.reh.js
-@@ -375,16 +375,2 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
- 
--		if (platform === 'linux' && process.env['VSCODE_NODE_GLIBC'] === '-glibc-2.17') {
--			result = es.merge(result,
--				gulp.src(`resources/server/bin/helpers/check-requirements-linux-legacy.sh`, { base: '.' })
--					.pipe(rename(`bin/helpers/check-requirements.sh`))
--					.pipe(util.setExecutableBit())
--			);
--		} else if (platform === 'linux' || platform === 'alpine') {
--			result = es.merge(result,
--				gulp.src(`resources/server/bin/helpers/check-requirements-linux.sh`, { base: '.' })
--					.pipe(rename(`bin/helpers/check-requirements.sh`))
--					.pipe(util.setExecutableBit())
--			);
--		}
--
- 		return result.pipe(vfs.dest(destination));
-diff --git a/remote/.yarnrc b/remote/.yarnrc
-index 4c99388..71a7164 100644
---- a/remote/.yarnrc
-+++ b/remote/.yarnrc
-@@ -1,3 +1,3 @@
- disturl "https://nodejs.org/dist"
--target "20.11.1"
-+target "16.20.2"
- ms_build_id "275039"
-diff --git a/remote/package.json b/remote/package.json
-index b84f513..42d8e41 100644
---- a/remote/package.json
-+++ b/remote/package.json
-@@ -31,3 +31,3 @@
-     "native-watchdog": "^1.4.1",
--    "node-pty": "1.1.0-beta11",
-+    "node-pty": "1.1.0-beta4",
-     "tas-client-umd": "0.2.0",
-diff --git a/remote/yarn.lock b/remote/yarn.lock
-index 4241bf0..5ce4431 100644
---- a/remote/yarn.lock
-+++ b/remote/yarn.lock
-@@ -412,2 +412,7 @@ ms@2.1.2:
- 
-+nan@^2.17.0:
-+  version "2.18.0"
-+  resolved "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz#26a6faae7ffbeb293a39660e88a76b82e30b7554"
-+  integrity sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==
-+
- napi-build-utils@^1.0.1:
-@@ -429,3 +434,3 @@ node-abi@^3.3.0:
- 
--node-addon-api@7.1.0, node-addon-api@^7.1.0:
-+node-addon-api@7.1.0:
-   version "7.1.0"
-@@ -454,8 +459,8 @@ node-gyp-build@4.8.1, node-gyp-build@^4.3.0:
- 
--node-pty@1.1.0-beta11:
--  version "1.1.0-beta11"
--  resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-1.1.0-beta11.tgz#909d5dd8f9aa2a7857e7b632fd4d2d4768bdf69f"
--  integrity sha512-vTjF+VrvSCfPDILUkIT+YrG1Fdn06/eBRS2fc9a3JzYAvknMB1Ip8aoJhxl8hNpjWAbprmCEiV91mlfNpCD+GQ==
-+node-pty@1.1.0-beta4:
-+  version "1.1.0-beta4"
-+  resolved "https://registry.npmjs.org/node-pty/-/node-pty-1.1.0-beta4.tgz#ee74d909c9f422ffc7f675e1092529673f8906ec"
-+  integrity sha512-CgffN9AxVtH4g7vDxtanm2qaR7jw3oet9r+ArzziGiFvmds9SdR3gXkZF0fqZWSxhTHZusJWvsuKvRv+5O2K8A==
-   dependencies:
--    node-addon-api "^7.1.0"
-+    nan "^2.17.0"
- 

patches/linux/reh.patch.no

@@ -1,42 +0,0 @@
-diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
-index 595d0ce..2e94d99 100644
---- a/build/gulpfile.reh.js
-+++ b/build/gulpfile.reh.js
-@@ -375,10 +375,2 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
- 
--		if (platform === 'linux' || platform === 'alpine') {
--			result = es.merge(result,
--				gulp.src(`resources/server/bin/helpers/check-requirements-linux.sh`, { base: '.' })
--					.pipe(rename(`bin/helpers/check-requirements.sh`))
--					.pipe(util.setExecutableBit())
--			);
--		}
--
- 		return result.pipe(vfs.dest(destination));
-diff --git a/resources/server/bin/code-server-linux.sh b/resources/server/bin/code-server-linux.sh
-index e3d96bd..3df32df 100644
---- a/resources/server/bin/code-server-linux.sh
-+++ b/resources/server/bin/code-server-linux.sh
-@@ -11,22 +11,2 @@ ROOT="$(dirname "$(dirname "$(readlink -f "$0")")")"
- 
--# Do not remove this check.
--# Provides a way to skip the server requirements check from
--# outside the install flow. A system process can create this
--# file before the server is downloaded and installed.
--skip_check=0
--if [ -f "/tmp/vscode-skip-server-requirements-check" ]; then
--	echo "!!! WARNING: Skipping server pre-requisite check !!!"
--	echo "!!! Server stability is not guaranteed. Proceed at your own risk. !!!"
--	skip_check=1
--fi
--
--# Check platform requirements
--if [ "$(echo "$@" | grep -c -- "--skip-requirements-check")" -eq 0 ] && [ $skip_check -eq 0 ]; then
--	$ROOT/bin/helpers/check-requirements.sh
--	exit_code=$?
--	if [ $exit_code -ne 0 ]; then
--		exit $exit_code
--	fi
--fi
--
- "$ROOT/node" ${INSPECT:-} "$ROOT/out/server-main.js" "$@"

patches/linux/reh/s390x/arch-4-s390x-package.json.patch

@@ -0,0 +1,35 @@
+diff --git a/package-lock.json b/package-lock.json
+index 7b02996..4642486 100644
+--- a/package-lock.json
++++ b/package-lock.json
+@@ -17875,10 +17875,11 @@
+       }
+     },
+     "node_modules/web-tree-sitter": {
+-      "version": "0.20.8",
+-      "resolved": "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.20.8.tgz",
+-      "integrity": "sha512-weOVgZ3aAARgdnb220GqYuh7+rZU0Ka9k9yfKtGAzEYMa6GgiCzW9JjQRJyCJakvibQW+dfjJdihjInKuuCAUQ==",
+-      "dev": true
++      "version": "0.23.0",
++      "resolved": "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.23.0.tgz",
++      "integrity": "sha512-p1T+ju2H30fpVX2q5yr+Wv/NfdMMWMjQp9Q+4eEPrHAJpPFh9DPfI2Yr9L1f5SA5KPE+g1cNUqPbpihxUDzmVw==",
++      "dev": true,
++      "license": "MIT"
+     },
+     "node_modules/webidl-conversions": {
+       "version": "3.0.1",
+diff --git a/package.json b/package.json
+index 7e0de18..4ceaded 100644
+--- a/package.json
++++ b/package.json
+@@ -226,7 +226,10 @@
+     },
+     "@parcel/watcher@2.1.0": {
+       "node-addon-api": "7.1.0"
++    },
++    "@vscode/l10n-dev@0.0.35": {
++      "web-tree-sitter": "0.23.0"
+     }
+   },
+   "repository": {
+     "type": "git",

patches/linux/rpm.patch

@@ -1,9 +1,14 @@
 diff --git a/resources/linux/rpm/code.spec.template b/resources/linux/rpm/code.spec.template
-index c9e57db..ef27166 100644
+index a73bc02..242bab0 100644
 --- a/resources/linux/rpm/code.spec.template
 +++ b/resources/linux/rpm/code.spec.template
 @@ -2,3 +2,3 @@ Name:     @@NAME@@
  Version:  @@VERSION@@
 -Release:  @@RELEASE@@.el8
-+Release:  el7
++Release:  el9
  Summary:  Code editing. Redefined.
+@@ -88 +88,3 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
+ %{_datadir}/zsh/site-functions/_%{name}
++
++%config(noreplace) /usr/share/%{name}/resources/app/product.json
+\ No newline at end of file

patches/linux/update-xdg-path.patch

@@ -0,0 +1,22 @@
+diff --git a/extensions/git/src/ipc/ipcServer.ts b/extensions/git/src/ipc/ipcServer.ts
+index a7142fe..526ca17 100644
+--- a/extensions/git/src/ipc/ipcServer.ts
++++ b/extensions/git/src/ipc/ipcServer.ts
+@@ -20,3 +20,7 @@ function getIPCHandlePath(id: string): string {
+ 	if (process.platform !== 'darwin' && process.env['XDG_RUNTIME_DIR']) {
+-		return path.join(process.env['XDG_RUNTIME_DIR'] as string, `vscode-git-${id}.sock`);
++		if (!!process.env.FLATPAK_ID) {
++			return path.join(process.env['XDG_RUNTIME_DIR'] as string, 'app', process.env.FLATPAK_ID, `vscode-git-${id}.sock`);
++		} else {
++			return path.join(process.env['XDG_RUNTIME_DIR'] as string, `vscode-git-${id}.sock`);
++		}
+ 	}
+diff --git a/src/vs/base/parts/ipc/node/ipc.net.ts b/src/vs/base/parts/ipc/node/ipc.net.ts
+index 629f2c4..ec1acba 100644
+--- a/src/vs/base/parts/ipc/node/ipc.net.ts
++++ b/src/vs/base/parts/ipc/node/ipc.net.ts
+@@ -774,3 +774,3 @@ function unmask(buffer: VSBuffer, mask: number): void {
+ // Related to https://github.com/microsoft/vscode/issues/30624
+-export const XDG_RUNTIME_DIR = <string | undefined>process.env['XDG_RUNTIME_DIR'];
++export const XDG_RUNTIME_DIR = <string | undefined>(!!process.env.FLATPAK_ID ? join(process.env['XDG_RUNTIME_DIR'] as string, 'app', process.env.FLATPAK_ID) : process.env['XDG_RUNTIME_DIR']);
+ 

patches/linux/use-node16.patch

@@ -1,28 +0,0 @@
-diff --git a/build/lib/fetch.js b/build/lib/fetch.js
-index 2fed63b..9a9f013 100644
---- a/build/lib/fetch.js
-+++ b/build/lib/fetch.js
-@@ -15,2 +15,3 @@ const crypto = require("crypto");
- const through2 = require("through2");
-+const fetch = require("node-fetch");
- function fetchUrls(urls, options) {
-diff --git a/build/linux/debian/install-sysroot.js b/build/linux/debian/install-sysroot.js
-index feca7d3..b4f6540 100644
---- a/build/linux/debian/install-sysroot.js
-+++ b/build/linux/debian/install-sysroot.js
-@@ -15,2 +15,3 @@ const crypto_1 = require("crypto");
- const ansiColors = require("ansi-colors");
-+const fetch = require("node-fetch");
- // Based on https://source.chromium.org/chromium/chromium/src/+/main:build/linux/sysroot_scripts/install-sysroot.py.
-diff --git a/yarn.lock b/yarn.lock
-index 2f4c572..6b65370 100644
---- a/yarn.lock
-+++ b/yarn.lock
-@@ -6458,2 +6458,7 @@ liftoff@^3.1.0:
- 
-+lilconfig@^2.0.5:
-+  version "2.1.0"
-+  resolved "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz#78e23ac89ebb7e1bfbf25b18043de756548e7f52"
-+  integrity sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==
-+
- lilconfig@^3.0.0:

patches/linux/verify-glibc.patch

@@ -1,14 +0,0 @@
-diff --git a/build/azure-pipelines/linux/verify-glibc-requirements.sh b/build/azure-pipelines/linux/verify-glibc-requirements.sh
-index f07c0ba..bd9aac1 100755
---- a/build/azure-pipelines/linux/verify-glibc-requirements.sh
-+++ b/build/azure-pipelines/linux/verify-glibc-requirements.sh
-@@ -36,3 +36,3 @@ for file in $files; do
-   if [[ "$glibc_version" != "$EXPECTED_GLIBC_VERSION" ]]; then
--    echo "Error: File $file has dependency on GLIBC > $EXPECTED_GLIBC_VERSION"
-+    echo "Error: File $file has dependency on GLIBC($glibc_version) != $EXPECTED_GLIBC_VERSION"
-     exit 1
-@@ -40,3 +40,3 @@ for file in $files; do
-   if [[ "$glibcxx_version" != "$EXPECTED_GLIBCXX_VERSION" ]]; then
--    echo "Error: File $file has dependency on GLIBCXX > $EXPECTED_GLIBCXX_VERSION"
-+    echo "Error: File $file has dependency on GLIBCXX($glibcxx_version) != $EXPECTED_GLIBCXX_VERSION"
-     exit 1

patches/linux/yarn-dependencies.patch

@@ -1,17 +1,12 @@
 diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
-index 72dd74f..0f70d8c 100644
+index 88e3c9e..4cad4f1 100644
 --- a/build/npm/postinstall.js
 +++ b/build/npm/postinstall.js
-@@ -55,10 +55,6 @@ function yarnInstall(dir, opts) {
+@@ -55,4 +55,6 @@ function npmInstall(dir, opts) {
  		opts.cwd = root;
--		if (process.env['npm_config_arch'] === 'arm64' || process.env['npm_config_arch'] === 'arm') {
-+		if (process.env['npm_config_arch'] === 'arm64' || process.env['npm_config_arch'] === 'arm' || process.env['npm_config_arch'] === 'ppc64' || process.env['npm_config_arch'] === 'riscv64') {
+-		if (process.env['npm_config_arch'] === 'arm64') {
++		if (process.env['npm_config_arch'] === 'arm64' || process.env['npm_config_arch'] === 'arm' || process.env['npm_config_arch'] === 'ppc64' || process.env['npm_config_arch'] === 'riscv64' || process.env['npm_config_arch'] === 's390x') {
  			run('sudo', ['docker', 'run', '--rm', '--privileged', 'multiarch/qemu-user-static', '--reset', '-p', 'yes'], opts);
++		} else if (process.env['npm_config_arch'] === 'loong64') {
++			run('sudo', ['docker', 'run', '--rm', '--privileged', 'loongcr.lcpu.dev/multiarch/archlinux', '--reset', '-p', 'yes'], opts);
  		}
--		if (process.env['npm_config_arch'] === 'arm') {
--			run('sudo', ['docker', 'run', '-e', 'GITHUB_TOKEN', '-e', 'npm_config_arch', '-v', `${process.env['VSCODE_HOST_MOUNT']}:/home/builduser`, '-v', `${process.env['VSCODE_HOST_MOUNT']}/.build/.netrc:/home/builduser/.netrc`, process.env['VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME'], 'yarn', '--cwd', dir, ...args], opts);
--		} else {
--			run('sudo', ['docker', 'run', '-e', 'GITHUB_TOKEN', '-e', 'npm_config_arch', '-v', `${process.env['VSCODE_HOST_MOUNT']}:/root/vscode`, '-v', `${process.env['VSCODE_HOST_MOUNT']}/.build/.netrc:/root/.netrc`, process.env['VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME'], 'yarn', '--cwd', dir, ...args], opts);
--		}
-+		run('sudo', ['docker', 'run', '-e', 'GITHUB_TOKEN', '-e', 'npm_config_arch', '-v', `${process.env['VSCODE_HOST_MOUNT']}:/root/vscode`, '-v', `${process.env['VSCODE_HOST_MOUNT']}/.build/.netrc:/root/.netrc`, process.env['VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME'], 'yarn', '--cwd', dir, ...args], opts);
- 		run('sudo', ['chown', '-R', `${userinfo.uid}:${userinfo.gid}`, `${dir}/node_modules`], opts);

patches/merge-user-product.patch

@@ -1,32 +1,36 @@
-diff --git a/src/main.js b/src/main.js
-index d986fee..1ad0ef0 100644
---- a/src/main.js
-+++ b/src/main.js
-@@ -18,2 +18,3 @@ perf.mark('code/didStartMain');
- const path = require('path');
-+const { fileURLToPath } = require('url');
- const fs = require('fs');
-@@ -149,2 +150,14 @@ app.once('ready', function () {
+diff --git a/src/main.ts b/src/main.ts
+index ff9a5e8..2135d00 100644
+--- a/src/main.ts
++++ b/src/main.ts
+@@ -8,2 +8,3 @@ import * as fs from 'original-fs';
+ import * as os from 'os';
++import { createRequire } from 'node:module';
+ import { performance } from 'perf_hooks';
+@@ -24,2 +25,3 @@ import { NativeParsedArgs } from './vs/platform/environment/common/argv.js';
+ const __dirname = path.dirname(fileURLToPath(import.meta.url));
++const require = createRequire(import.meta.url);
+ 
+@@ -112,2 +114,14 @@ registerListeners();
  
 +function resolveUserProduct() {
-+	const userDataPath = getUserDataPath({}, product.nameShort ?? 'code-oss-dev');
-+	const userProductPath = `file:///${userDataPath}/product.json`;
++	const userProductPath = path.join(userDataPath, 'product.json');
 +
 +	try {
 +		// Assign the product configuration to the global scope
-+		const productPath = require(fileURLToPath(userProductPath));
-+		global["_VSCODE_USER_PRODUCT_JSON"] = productPath;
++		const productJson = require(userProductPath);
++		// @ts-expect-error
++		globalThis._VSCODE_USER_PRODUCT_JSON = productJson;
 +	} catch (ex) {
 +	}
 +}
 +
  /**
-@@ -160,2 +173,3 @@ function startup(codeCachePath, nlsConfig) {
+@@ -183,2 +197,3 @@ async function startup(codeCachePath: string | undefined, nlsConfig: INLSConfigu
  	process.env['VSCODE_CODE_CACHE_PATH'] = codeCachePath || '';
 +	resolveUserProduct();
  
 diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts
-index 51a55e1..e2af375 100644
+index 1a2a619..9bf5ac0 100644
 --- a/src/vs/platform/product/common/product.ts
 +++ b/src/vs/platform/product/common/product.ts
 @@ -29,2 +29,36 @@ else if (globalThis._VSCODE_PRODUCT_JSON && globalThis._VSCODE_PACKAGE_JSON) {

patches/optional-tree-sitter.patch

@@ -0,0 +1,161 @@
+diff --git a/build/package-lock.json b/build/package-lock.json
+index 1e373f2..3ea31d0 100644
+--- a/build/package-lock.json
++++ b/build/package-lock.json
+@@ -53,3 +53,2 @@
+         "through2": "^4.0.2",
+-        "tree-sitter": "^0.20.5",
+         "vscode-universal-bundler": "^0.1.3",
+@@ -59,2 +58,3 @@
+       "optionalDependencies": {
++        "tree-sitter": "^0.20.5",
+         "tree-sitter-typescript": "^0.20.5",
+@@ -1381,3 +1381,3 @@
+       "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+-      "devOptional": true,
++      "optional": true,
+       "dependencies": {
+@@ -1433,3 +1433,2 @@
+       "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+-      "devOptional": true,
+       "funding": [
+@@ -1448,2 +1447,3 @@
+       ],
++      "optional": true,
+       "dependencies": {
+@@ -1622,3 +1622,3 @@
+       "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+-      "devOptional": true
++      "optional": true
+     },
+@@ -1830,3 +1830,3 @@
+       "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+-      "devOptional": true,
++      "optional": true,
+       "engines": {
+@@ -1896,3 +1896,3 @@
+       "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==",
+-      "devOptional": true,
++      "optional": true,
+       "engines": {
+@@ -2150,3 +2150,3 @@
+       "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==",
+-      "devOptional": true,
++      "optional": true,
+       "engines": {
+@@ -2281,3 +2281,3 @@
+       "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
+-      "devOptional": true
++      "optional": true
+     },
+@@ -2363,3 +2363,3 @@
+       "integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4= sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==",
+-      "devOptional": true
++      "optional": true
+     },
+@@ -2676,3 +2676,2 @@
+       "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+-      "devOptional": true,
+       "funding": [
+@@ -2690,3 +2689,4 @@
+         }
+-      ]
++      ],
++      "optional": true
+     },
+@@ -2713,3 +2713,3 @@
+       "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+-      "devOptional": true
++      "optional": true
+     },
+@@ -3165,3 +3165,3 @@
+       "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
+-      "devOptional": true
++      "optional": true
+     },
+@@ -3183,3 +3183,3 @@
+       "integrity": "sha512-nO1xXxfh/RWNxfd/XPfbIfFk5vgLsAxUR9y5O0cHMJu/AW9U95JLXqthYHjEp+8gQ5p96K9jUp8nbVOxCdRbtw==",
+-      "devOptional": true
++      "optional": true
+     },
+@@ -3189,3 +3189,3 @@
+       "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==",
+-      "devOptional": true
++      "optional": true
+     },
+@@ -3195,3 +3195,3 @@
+       "integrity": "sha512-qWO5l3SCqbwQavymOmtTVuCWZE23++S+rxyoHjXqUmPyzRcaoI4lA2gO55/drddGnedAyjA7sk76SfQ5lfUMnw==",
+-      "devOptional": true,
++      "optional": true,
+       "dependencies": {
+@@ -3207,3 +3207,3 @@
+       "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+-      "devOptional": true,
++      "optional": true,
+       "dependencies": {
+@@ -3475,3 +3475,3 @@
+       "integrity": "sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==",
+-      "devOptional": true,
++      "optional": true,
+       "dependencies": {
+@@ -3559,3 +3559,3 @@
+       "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+-      "devOptional": true,
++      "optional": true,
+       "dependencies": {
+@@ -3772,3 +3772,2 @@
+       "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
+-      "devOptional": true,
+       "funding": [
+@@ -3786,3 +3785,4 @@
+         }
+-      ]
++      ],
++      "optional": true
+     },
+@@ -3792,3 +3792,2 @@
+       "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==",
+-      "devOptional": true,
+       "funding": [
+@@ -3807,2 +3806,3 @@
+       ],
++      "optional": true,
+       "dependencies": {
+@@ -3901,3 +3901,3 @@
+       "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo= sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
+-      "devOptional": true,
++      "optional": true,
+       "engines": {
+@@ -3934,3 +3934,3 @@
+       "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+-      "devOptional": true,
++      "optional": true,
+       "dependencies": {
+@@ -3946,3 +3946,3 @@
+       "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+-      "devOptional": true,
++      "optional": true,
+       "dependencies": {
+@@ -4029,4 +4029,4 @@
+       "integrity": "sha512-GxJodajVpfgb3UREzzIbtA1hyRnTxVbWVXrbC6sk4xTMH5ERMBJk9HJNq4c8jOJeUaIOmLcwg+t6mez/PDvGqg==",
+-      "devOptional": true,
+       "hasInstallScript": true,
++      "optional": true,
+       "dependencies": {
+@@ -4066,3 +4066,3 @@
+       "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
+-      "devOptional": true,
++      "optional": true,
+       "dependencies": {
+diff --git a/build/package.json b/build/package.json
+index aa94a21..9644be4 100644
+--- a/build/package.json
++++ b/build/package.json
+@@ -47,3 +47,2 @@
+     "through2": "^4.0.2",
+-    "tree-sitter": "^0.20.5",
+     "vscode-universal-bundler": "^0.1.3",
+@@ -59,2 +58,3 @@
+   "optionalDependencies": {
++    "tree-sitter": "^0.20.5",
+     "tree-sitter-typescript": "^0.20.5",

patches/osx/fix-emulated-urls.patch

@@ -0,0 +1,11 @@
+diff --git a/src/vs/workbench/electron-sandbox/window.ts b/src/vs/workbench/electron-sandbox/window.ts
+index 90c9654..3ef5d32 100644
+--- a/src/vs/workbench/electron-sandbox/window.ts
++++ b/src/vs/workbench/electron-sandbox/window.ts
+@@ -257,4 +257,4 @@ export class NativeWindow extends BaseWindow {
+ 						const quality = this.productService.quality;
+-						const stableURL = 'https://code.visualstudio.com/docs/?dv=osx';
+-						const insidersURL = 'https://code.visualstudio.com/docs/?dv=osx&build=insiders';
++						const stableURL = 'https://github.com/VSCodium/vscodium/releases/latest';
++						const insidersURL = 'https://github.com/VSCodium/vscodium-insiders/releases/latest';
+ 						this.openerService.open(quality === 'stable' ? stableURL : insidersURL);

patches/ppc64le-and-riscv64-support.patch

@@ -1,458 +0,0 @@
-diff --git a/build/azure-pipelines/linux/setup-env.sh b/build/azure-pipelines/linux/setup-env.sh
-index e42a6b12b1f..e17f0e2bb17 100755
---- a/build/azure-pipelines/linux/setup-env.sh
-+++ b/build/azure-pipelines/linux/setup-env.sh
-@@ -7,6 +7,10 @@ if [ "$SYSROOT_ARCH" == "x64" ]; then
-   SYSROOT_ARCH="amd64"
- fi
- 
-+if [ "$npm_config_arch" == "riscv64" ]; then
-+  exit 0
-+fi
-+
- export VSCODE_SYSROOT_DIR=$PWD/.build/sysroots
- SYSROOT_ARCH="$SYSROOT_ARCH" node -e '(async () => { const { getVSCodeSysroot } = require("./build/linux/debian/install-sysroot.js"); await getVSCodeSysroot(process.env["SYSROOT_ARCH"]); })()'
- 
-@@ -67,4 +71,19 @@ elif [ "$npm_config_arch" == "arm" ]; then
-     export VSCODE_REMOTE_CXXFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot"
-     export VSCODE_REMOTE_LDFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot -L$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot/usr/lib/arm-linux-gnueabihf -L$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot/lib/arm-linux-gnueabihf"
-   fi
-+elif [ "$npm_config_arch" == "ppc64" ]; then
-+  if [ "$(echo "$@" | grep -c -- "--only-remote")" -eq 0 ]; then
-+    # Set compiler toolchain for client native modules
-+    export CC=$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/bin/powerpc64le-linux-gnu-gcc
-+    export CXX=$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/bin/powerpc64le-linux-gnu-g++
-+    export CXXFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/powerpc64le-linux-gnu/sysroot"
-+    export LDFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/powerpc64le-linux-gnu/sysroot -L$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/powerpc64le-linux-gnu/sysroot/usr/lib/powerpc64le-linux-gnu -L$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/powerpc64le-linux-gnu/sysroot/lib/powerpc64le-linux-gnu"
-+
-+    # Set compiler toolchain for remote server
-+    export VSCODE_REMOTE_CC=$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/bin/powerpc64le-linux-gnu-gcc
-+    export VSCODE_REMOTE_CXX=$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/bin/powerpc64le-linux-gnu-g++
-+    export VSCODE_REMOTE_CXXFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/powerpc64le-linux-gnu/sysroot"
-+    export VSCODE_REMOTE_LDFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/powerpc64le-linux-gnu/sysroot -L$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/powerpc64le-linux-gnu/sysroot/usr/lib/powerpc64le-linux-gnu -L$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/powerpc64le-linux-gnu/sysroot/lib/powerpc64le-linux-gnu"
-+  fi
-+
- fi
-diff --git a/build/azure-pipelines/linux/verify-glibc-requirements.sh b/build/azure-pipelines/linux/verify-glibc-requirements.sh
-index f07c0ba..1cb257b 100755
---- a/build/azure-pipelines/linux/verify-glibc-requirements.sh
-+++ b/build/azure-pipelines/linux/verify-glibc-requirements.sh
-@@ -7,6 +7,8 @@ if [ "$VSCODE_ARCH" == "arm64" ]; then
-   TRIPLE="aarch64-linux-gnu"
- elif [ "$VSCODE_ARCH" == "armhf" ]; then
-   TRIPLE="arm-rpi-linux-gnueabihf"
-+elif [ "$VSCODE_ARCH" == "ppc64le" ]; then
-+  TRIPLE="powerpc64le-linux-gnu"
- fi
- 
- # Get all files with .node extension from remote/node_modules folder
-diff --git a/build/checksums/vscode-sysroot.txt b/build/checksums/vscode-sysroot.txt
-index 0b5f38c60ce..70770276503 100644
---- a/build/checksums/vscode-sysroot.txt
-+++ b/build/checksums/vscode-sysroot.txt
-@@ -4,3 +4,4 @@
- 7aea163f7fad8cc50000c86b5108be880121d35e2f55d016ef8c96bbe54129eb  arm-rpi-linux-gnueabihf-glibc-2.28.tar.gz
- 5aae21115f1d284c3cdf32c83db15771b59bc80793f1423032abf5a823c0d658  x86_64-linux-gnu-glibc-2.17.tar.gz
- dbb927408393041664a020661f2641c9785741be3d29b050b9dac58980967784  x86_64-linux-gnu-glibc-2.28.tar.gz
-+fa8176d27be18bb0eeb7f55b0fa22255050b430ef68c29136599f02976eb0b1b  powerpc64le-linux-gnu-glibc-2.28.tar.gz
-diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
-index c2b81d0cf7c..fa5de83a076 100644
---- a/build/gulpfile.reh.js
-+++ b/build/gulpfile.reh.js
-@@ -44,6 +44,8 @@ const BUILD_TARGETS = [
- 	{ platform: 'linux', arch: 'x64' },
- 	{ platform: 'linux', arch: 'armhf' },
- 	{ platform: 'linux', arch: 'arm64' },
-+	{ platform: 'linux', arch: 'ppc64le' },
-+	{ platform: 'linux', arch: 'riscv64' },
- 	{ platform: 'alpine', arch: 'arm64' },
- 	// legacy: we use to ship only one alpine so it was put in the arch, but now we ship
- 	// multiple alpine images and moved to a better model (alpine as the platform)
-@@ -210,6 +212,14 @@ function nodejs(platform, arch) {
- 				.pipe(rename('node.exe'));
- 		case 'darwin':
- 		case 'linux':
-+			if (arch === 'riscv64') {
-+				return fetchUrls(`/download/release/v${nodeVersion}/node-v${nodeVersion}-${platform}-${arch}.tar.gz`,
-+					{ base: 'https://unofficial-builds.nodejs.org', checksumSha256 }).pipe(flatmap(stream => stream.pipe(gunzip()).pipe
-+						(untar())))
-+					.pipe(filter('**/node'))
-+					.pipe(util.setExecutableBit('**'))
-+					.pipe(rename('node'));
-+			}
- 			return (product.nodejsRepository !== 'https://nodejs.org' ?
- 				fetchGithub(product.nodejsRepository, { version: `${nodeVersion}-${internalNodeVersion}`, name: `node-v${nodeVersion}${glibcPrefix}-${platform}-${arch}.tar.gz`, checksumSha256 }) :
- 				fetchUrls(`/dist/v${nodeVersion}/node-v${nodeVersion}-${platform}-${arch}.tar.gz`, { base: 'https://nodejs.org', checksumSha256 })
-diff --git a/build/gulpfile.scan.js b/build/gulpfile.scan.js
-index 6f8144b0954..8a8195e9b66 100644
---- a/build/gulpfile.scan.js
-+++ b/build/gulpfile.scan.js
-@@ -24,6 +24,8 @@ const BUILD_TARGETS = [
- 	{ platform: 'linux', arch: 'x64' },
- 	{ platform: 'linux', arch: 'armhf' },
- 	{ platform: 'linux', arch: 'arm64' },
-+	{ platform: 'linux', arch: 'ppc64le' },
-+	{ platform: 'linux', arch: 'riscv64' },
- ];
- 
- BUILD_TARGETS.forEach(buildTarget => {
-diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index e1507e0424f..80ed8d91a41 100644
---- a/build/gulpfile.vscode.js
-+++ b/build/gulpfile.vscode.js
-@@ -429,6 +429,8 @@ const BUILD_TARGETS = [
- 	{ platform: 'linux', arch: 'x64' },
- 	{ platform: 'linux', arch: 'armhf' },
- 	{ platform: 'linux', arch: 'arm64' },
-+	{ platform: 'linux', arch: 'ppc64le' },
-+	{ platform: 'linux', arch: 'riscv64' },
- ];
- BUILD_TARGETS.forEach(buildTarget => {
- 	const dashed = (str) => (str ? `-${str}` : ``);
-diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js
-index 8c2b62f7b2a..a58ec3d7725 100644
---- a/build/gulpfile.vscode.linux.js
-+++ b/build/gulpfile.vscode.linux.js
-@@ -28,7 +28,7 @@ const linuxPackageRevision = Math.floor(new Date().getTime() / 1000);
-  * @param {string} arch
-  */
- function getDebPackageArch(arch) {
--	return { x64: 'amd64', armhf: 'armhf', arm64: 'arm64' }[arch];
-+	return { x64: 'amd64', armhf: 'armhf', arm64: 'arm64', ppc64le: 'ppc64le', riscv64: 'riscv64' }[arch];
- }
- 
- function prepareDebPackage(arch) {
-@@ -134,7 +134,7 @@ function getRpmBuildPath(rpmArch) {
-  * @param {string} arch
-  */
- function getRpmPackageArch(arch) {
--	return { x64: 'x86_64', armhf: 'armv7hl', arm64: 'aarch64' }[arch];
-+	return { x64: 'x86_64', armhf: 'armv7hl', arm64: 'aarch64', ppc64le: 'ppc64le', riscv64: 'riscv64' }[arch];
- }
- 
- /**
-@@ -295,6 +295,8 @@ const BUILD_TARGETS = [
- 	{ arch: 'x64' },
- 	{ arch: 'armhf' },
- 	{ arch: 'arm64' },
-+	{ arch: 'ppc64le' },
-+	{ arch: 'riscv64' },
- ];
- 
- BUILD_TARGETS.forEach(({ arch }) => {
-diff --git a/build/linux/debian/calculate-deps.ts b/build/linux/debian/calculate-deps.ts
-index 92f8065f262..4d930b269aa 100644
---- a/build/linux/debian/calculate-deps.ts
-+++ b/build/linux/debian/calculate-deps.ts
-@@ -59,6 +59,18 @@ function calculatePackageDeps(binaryPath: string, arch: DebianArchString, chromi
- 				`-l${vscodeSysroot}/usr/lib/aarch64-linux-gnu`,
- 				`-l${vscodeSysroot}/lib/aarch64-linux-gnu`);
- 			break;
-+		case 'ppc64le':
-+			cmd.push(`-l${chromiumSysroot}/usr/lib/powerpc64le-linux-gnu`,
-+				`-l${chromiumSysroot}/lib/powerpc64le-linux-gnu`,
-+				`-l${vscodeSysroot}/usr/lib/powerpc64le-linux-gnu`,
-+				`-l${vscodeSysroot}/lib/powerpc64le-linux-gnu`);
-+			break;
-+		case 'riscv64':
-+			cmd.push(`-l${chromiumSysroot}/usr/lib/riscv64-linux-gnu`,
-+				`-l${chromiumSysroot}/lib/riscv64-linux-gnu`,
-+				`-l${vscodeSysroot}/usr/lib/riscv64-linux-gnu`,
-+				`-l${vscodeSysroot}/lib/riscv64-linux-gnu`);
-+			break;
- 	}
- 	cmd.push(`-l${chromiumSysroot}/usr/lib`);
- 	cmd.push(`-L${vscodeSysroot}/debian/libxkbfile1/DEBIAN/shlibs`);
-diff --git a/build/linux/debian/dep-lists.ts b/build/linux/debian/dep-lists.ts
-index 3d6c2eba6e9..0856a0514bd 100644
---- a/build/linux/debian/dep-lists.ts
-+++ b/build/linux/debian/dep-lists.ts
-@@ -140,5 +140,84 @@ export const referenceGeneratedDepsByArch = {
- 		'libxkbfile1 (>= 1:1.1.0)',
- 		'libxrandr2',
- 		'xdg-utils (>= 1.0.2)'
--	]
-+	],
-+	'ppc64le': [
-+		'ca-certificates',
-+		'libasound2 (>= 1.0.17)',
-+		'libatk-bridge2.0-0 (>= 2.5.3)',
-+		'libatk1.0-0 (>= 2.2.0)',
-+		'libatspi2.0-0 (>= 2.9.90)',
-+		'libc6 (>= 2.17)',
-+		'libc6 (>= 2.28)',
-+		'libcairo2 (>= 1.6.0)',
-+		'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3',
-+		'libdbus-1-3 (>= 1.9.14)',
-+		'libdrm2 (>= 2.4.75)',
-+		'libexpat1 (>= 2.1~beta3)',
-+		'libgbm1 (>= 17.1.0~rc2)',
-+		'libglib2.0-0 (>= 2.37.3)',
-+		'libgssapi-krb5-2 (>= 1.17)',
-+		'libgtk-3-0 (>= 3.9.10)',
-+		'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
-+		'libkrb5-3 (>= 1.6.dfsg.2)',
-+		'libnspr4 (>= 2:4.9-2~)',
-+		'libnss3 (>= 2:3.30)',
-+		'libnss3 (>= 3.26)',
-+		'libpango-1.0-0 (>= 1.14.0)',
-+		'libstdc++6 (>= 4.1.1)',
-+		'libstdc++6 (>= 5)',
-+		'libstdc++6 (>= 5.2)',
-+		'libstdc++6 (>= 6)',
-+		'libx11-6',
-+		'libx11-6 (>= 2:1.4.99.1)',
-+		'libxcb1 (>= 1.9.2)',
-+		'libxcomposite1 (>= 1:0.4.4-1)',
-+		'libxdamage1 (>= 1:1.1)',
-+		'libxext6',
-+		'libxfixes3',
-+		'libxkbcommon0 (>= 0.5.0)',
-+		'libxkbfile1 (>= 1:1.1.0)',
-+		'libxrandr2',
-+		'xdg-utils (>= 1.0.2)'
-+	],
-+	'riscv64': [
-+		'ca-certificates',
-+		'libatomic1',
-+		'libasound2 (>= 1.0.17)',
-+		'libatk-bridge2.0-0 (>= 2.5.3)',
-+		'libatk1.0-0 (>= 2.2.0)',
-+		'libatspi2.0-0 (>= 2.9.90)',
-+		'libc6 (>= 2.17)',
-+		'libc6 (>= 2.28)',
-+		'libcairo2 (>= 1.6.0)',
-+		'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3',
-+		'libdbus-1-3 (>= 1.0.2)',
-+		'libdrm2 (>= 2.4.60)',
-+		'libexpat1 (>= 2.0.1)',
-+		'libgbm1 (>= 17.1.0~rc2)',
-+		'libglib2.0-0 (>= 2.16.0)',
-+		'libglib2.0-0 (>= 2.39.4)',
-+		'libgtk-3-0 (>= 3.9.10)',
-+		'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
-+		'libnspr4 (>= 2:4.9-2~)',
-+		'libnss3 (>= 2:3.22)',
-+		'libnss3 (>= 3.26)',
-+		'libpango-1.0-0 (>= 1.14.0)',
-+		'libsecret-1-0 (>= 0.18)',
-+		'libstdc++6 (>= 4.1.1)',
-+		'libstdc++6 (>= 5)',
-+		'libstdc++6 (>= 5.2)',
-+		'libstdc++6 (>= 6)',
-+		'libx11-6',
-+		'libx11-6 (>= 2:1.4.99.1)',
-+		'libxcb1 (>= 1.9.2)',
-+		'libxcomposite1 (>= 1:0.4.4-1)',
-+		'libxdamage1 (>= 1:1.1)',
-+		'libxext6',
-+		'libxfixes3',
-+		'libxkbcommon0 (>= 0.4.1)',
-+		'libxkbfile1',
-+		'libxrandr2',
-+		'xdg-utils (>= 1.0.2)'
-+	],
- };
-diff --git a/build/linux/debian/install-sysroot.js b/build/linux/debian/install-sysroot.js
-index feca7d3..59c1c6a 100644
---- a/build/linux/debian/install-sysroot.js
-+++ b/build/linux/debian/install-sysroot.js
-@@ -70,7 +70,9 @@ async function fetchUrl(options, retries = 10, retryDelay = 1000) {
-         const timeout = setTimeout(() => controller.abort(), 30 * 1000);
-         const version = '20240129-253798';
-         try {
--            const response = await fetch(`https://api.github.com/repos/Microsoft/vscode-linux-build-agent/releases/tags/v${version}`, {
-+            // If the assetName starts with 'powerpc64le', we fetch from VSCodium/vscode-linux-build-agent
-+            const repo = options.assetName.startsWith('powerpc64le') ? 'VSCodium/vscode-linux-build-agent' : 'Microsoft/vscode-linux-build-agent';
-+            const response = await fetch(`https://api.github.com/repos/${repo}/releases/tags/v${version}`, {
-                 headers: ghApiHeaders,
-                 signal: controller.signal /* Typings issue with lib.dom.d.ts */
-             });
-@@ -79,7 +81,7 @@ async function fetchUrl(options, retries = 10, retryDelay = 1000) {
-                 const contents = Buffer.from(await response.arrayBuffer());
-                 const asset = JSON.parse(contents.toString()).assets.find((a) => a.name === options.assetName);
-                 if (!asset) {
--                    throw new Error(`Could not find asset in release of Microsoft/vscode-linux-build-agent @ ${version}`);
-+                    throw new Error(`Could not find asset in release of ${repo} @ ${version}`);
-                 }
-                 console.log(`Found asset ${options.assetName} @ ${asset.url}.`);
-                 const assetResponse = await fetch(asset.url, {
-@@ -134,6 +136,14 @@ async function getVSCodeSysroot(arch) {
-             expectedName = `arm-rpi-linux-gnueabihf${prefix}.tar.gz`;
-             triple = 'arm-rpi-linux-gnueabihf';
-             break;
-+		case 'ppc64le':
-+			expectedName = `powerpc64le-linux-gnu${prefix}.tar.gz`;
-+			triple = `powerpc64le-linux-gnu`;
-+			break;
-+		case 'riscv64':
-+			expectedName = `DUMMY`;
-+			triple = 'riscv64-linux-gnu';
-+			break;
-     }
-     console.log(`Fetching ${expectedName} for ${triple}`);
-     const checksumSha256 = getVSCodeSysrootChecksum(expectedName);
-diff --git a/build/linux/debian/types.ts b/build/linux/debian/types.ts
-index e97485ef128..01b121bc928 100644
---- a/build/linux/debian/types.ts
-+++ b/build/linux/debian/types.ts
-@@ -3,8 +3,8 @@
-  *  Licensed under the MIT License. See License.txt in the project root for license information.
-  *--------------------------------------------------------------------------------------------*/
- 
--export type DebianArchString = 'amd64' | 'armhf' | 'arm64';
-+export type DebianArchString = 'amd64' | 'armhf' | 'arm64' | 'ppc64le' | 'riscv64';
- 
- export function isDebianArchString(s: string): s is DebianArchString {
--	return ['amd64', 'armhf', 'arm64'].includes(s);
-+	return ['amd64', 'armhf', 'arm64', 'ppc64le', 'riscv64'].includes(s);
- }
-diff --git a/cli/src/update_service.rs b/cli/src/update_service.rs
-index 4bec13d6e86..3debda1224a 100644
---- a/cli/src/update_service.rs
-+++ b/cli/src/update_service.rs
-@@ -214,6 +214,9 @@ pub enum Platform {
- 	LinuxARM64Legacy,
- 	LinuxARM32,
- 	LinuxARM32Legacy,
-+	LinuxPPC64LE,
-+	LinuxPPC64LELegacy,
-+	LinuxRISCV64,
- 	DarwinX64,
- 	DarwinARM64,
- 	WindowsX64,
-@@ -227,6 +230,8 @@ impl Platform {
- 			Platform::LinuxX64 => Some("linux-x64".to_owned()),
- 			Platform::LinuxARM64 => Some("linux-arm64".to_owned()),
- 			Platform::LinuxARM32 => Some("linux-armhf".to_owned()),
-+			Platform::LinuxPPC64LE => Some("linux-ppc64le".to_owned()),
-+			Platform::LinuxRISCV64 => Some("linux-riscv64".to_owned()),
- 			Platform::DarwinX64 => Some("darwin".to_owned()),
- 			Platform::DarwinARM64 => Some("darwin-arm64".to_owned()),
- 			Platform::WindowsX64 => Some("win32-x64-archive".to_owned()),
-@@ -245,6 +250,9 @@ impl Platform {
- 			Platform::LinuxARM64Legacy => "server-linux-legacy-arm64",
- 			Platform::LinuxARM32 => "server-linux-armhf",
- 			Platform::LinuxARM32Legacy => "server-linux-legacy-armhf",
-+			Platform::LinuxPPC64LE => "server-linux-ppc64le",
-+			Platform::LinuxPPC64LELegacy => "server-linux-legacy-ppc64le",
-+			Platform::LinuxRISCV64 => "server-linux-riscv64",
- 			Platform::DarwinX64 => "server-darwin",
- 			Platform::DarwinARM64 => "server-darwin-arm64",
- 			Platform::WindowsX64 => "server-win32-x64",
-@@ -264,6 +272,9 @@ impl Platform {
- 			Platform::LinuxARM64Legacy => "cli-linux-arm64",
- 			Platform::LinuxARM32 => "cli-linux-armhf",
- 			Platform::LinuxARM32Legacy => "cli-linux-armhf",
-+			Platform::LinuxPPC64LE => "cli-linux-ppc64le",
-+			Platform::LinuxPPC64LELegacy => "cli-linux-ppc64le",
-+			Platform::LinuxRISCV64 => "cli-linux-riscv64",
- 			Platform::DarwinX64 => "cli-darwin-x64",
- 			Platform::DarwinARM64 => "cli-darwin-arm64",
- 			Platform::WindowsARM64 => "cli-win32-arm64",
-@@ -296,6 +307,10 @@ impl Platform {
- 			Some(Platform::LinuxARM32)
- 		} else if cfg!(all(target_os = "linux", target_arch = "aarch64")) {
- 			Some(Platform::LinuxARM64)
-+		} else if cfg!(all(target_os = "linux", target_arch = "ppc64le")) {
-+			Some(Platform::LinuxPPC64LE)
-+		} else if cfg!(all(target_os = "linux", target_arch = "riscv64")) {
-+			Some(Platform::LinuxRISCV64)
- 		} else if cfg!(all(target_os = "macos", target_arch = "x86_64")) {
- 			Some(Platform::DarwinX64)
- 		} else if cfg!(all(target_os = "macos", target_arch = "aarch64")) {
-@@ -323,6 +338,9 @@ impl fmt::Display for Platform {
- 			Platform::LinuxARM64Legacy => "LinuxARM64Legacy",
- 			Platform::LinuxARM32 => "LinuxARM32",
- 			Platform::LinuxARM32Legacy => "LinuxARM32Legacy",
-+			Platform::LinuxPPC64LE => "LinuxPPC64LE",
-+			Platform::LinuxPPC64LELegacy => "LinuxPPC64LELegacy",
-+			Platform::LinuxRISCV64 => "LinuxRISCV64",
- 			Platform::DarwinX64 => "DarwinX64",
- 			Platform::DarwinARM64 => "DarwinARM64",
- 			Platform::WindowsX64 => "WindowsX64",
-diff --git a/cli/src/util/prereqs.rs b/cli/src/util/prereqs.rs
-index 20a5bc94b37..50678354245 100644
---- a/cli/src/util/prereqs.rs
-+++ b/cli/src/util/prereqs.rs
-@@ -73,6 +73,10 @@ impl PreReqChecker {
- 					Platform::LinuxX64
- 				} else if cfg!(target_arch = "arm") {
- 					Platform::LinuxARM32
-+				} else if cfg!(target_arch = "ppc64le") {
-+					Platform::LinuxPPC64LE
-+				} else if cfg!(target_arch = "riscv64") {
-+					Platform::LinuxRISCV64
- 				} else {
- 					Platform::LinuxARM64
- 				});
-@@ -82,6 +86,8 @@ impl PreReqChecker {
- 					Platform::LinuxX64Legacy
- 				} else if cfg!(target_arch = "arm") {
- 					Platform::LinuxARM32Legacy
-+				} else if cfg!(target_arch = "ppc64le") {
-+					Platform::LinuxPPC64LELegacy
- 				} else {
- 					Platform::LinuxARM64Legacy
- 				});
-diff --git a/resources/server/bin/helpers/check-requirements-linux.sh b/resources/server/bin/helpers/check-requirements-linux.sh
-index 079557869e3..c057746b870 100644
---- a/resources/server/bin/helpers/check-requirements-linux.sh
-+++ b/resources/server/bin/helpers/check-requirements-linux.sh
-@@ -50,6 +50,8 @@ case $ARCH in
- 			LDCONFIG_ARCH="AArch64"
- 		fi
- 		;;
-+    ppc64el) LDCONFIG_ARCH="64bit";;
-+    riscv64) LDCONFIG_ARCH="RISC-V";;
- esac
- 
- if [ "$OS_ID" != "alpine" ]; then
-diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts
-index 9dae82eba07..94246285b26 100644
---- a/src/vs/platform/extensionManagement/common/extensionManagement.ts
-+++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts
-@@ -33,6 +33,8 @@ export function TargetPlatformToString(targetPlatform: TargetPlatform) {
- 		case TargetPlatform.LINUX_X64: return 'Linux 64 bit';
- 		case TargetPlatform.LINUX_ARM64: return 'Linux ARM 64';
- 		case TargetPlatform.LINUX_ARMHF: return 'Linux ARM';
-+		case TargetPlatform.LINUX_PPC64LE: return 'Linux PowerPC';
-+		case TargetPlatform.LINUX_RISCV64: return 'Linux RISC-V 64';
- 
- 		case TargetPlatform.ALPINE_X64: return 'Alpine Linux 64 bit';
- 		case TargetPlatform.ALPINE_ARM64: return 'Alpine ARM 64';
-@@ -56,6 +58,8 @@ export function toTargetPlatform(targetPlatform: string): TargetPlatform {
- 		case TargetPlatform.LINUX_X64: return TargetPlatform.LINUX_X64;
- 		case TargetPlatform.LINUX_ARM64: return TargetPlatform.LINUX_ARM64;
- 		case TargetPlatform.LINUX_ARMHF: return TargetPlatform.LINUX_ARMHF;
-+		case TargetPlatform.LINUX_PPC64LE: return TargetPlatform.LINUX_PPC64LE;
-+		case TargetPlatform.LINUX_RISCV64: return TargetPlatform.LINUX_RISCV64;
- 
- 		case TargetPlatform.ALPINE_X64: return TargetPlatform.ALPINE_X64;
- 		case TargetPlatform.ALPINE_ARM64: return TargetPlatform.ALPINE_ARM64;
-@@ -91,6 +95,12 @@ export function getTargetPlatform(platform: Platform | 'alpine', arch: string |
- 			if (arch === 'arm') {
- 				return TargetPlatform.LINUX_ARMHF;
- 			}
-+			if (arch === 'ppc64le') {
-+				return TargetPlatform.LINUX_PPC64LE;
-+			}
-+			if (arch === 'riscv64') {
-+				return TargetPlatform.LINUX_RISCV64;
-+			}
- 			return TargetPlatform.UNKNOWN;
- 
- 		case 'alpine':
-diff --git a/src/vs/platform/extensions/common/extensions.ts b/src/vs/platform/extensions/common/extensions.ts
-index 331aba1b55f..cade78e6557 100644
---- a/src/vs/platform/extensions/common/extensions.ts
-+++ b/src/vs/platform/extensions/common/extensions.ts
-@@ -303,6 +303,8 @@ export const enum TargetPlatform {
- 	LINUX_X64 = 'linux-x64',
- 	LINUX_ARM64 = 'linux-arm64',
- 	LINUX_ARMHF = 'linux-armhf',
-+	LINUX_PPC64LE = 'linux-ppc64le',
-+	LINUX_RISCV64 = 'linux-riscv64',
- 
- 	ALPINE_X64 = 'alpine-x64',
- 	ALPINE_ARM64 = 'alpine-arm64',

patches/report-issue.patch

@@ -1,5 +1,5 @@
 diff --git a/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsSlowActions.ts b/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsSlowActions.ts
-index 87839a6..49727fc 100644
+index 447f4c9..4ad0e18 100644
 --- a/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsSlowActions.ts
 +++ b/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsSlowActions.ts
 @@ -153,3 +153,3 @@ class ReportExtensionSlowAction extends Action {
@@ -7,19 +7,16 @@ index 87839a6..49727fc 100644
 -- VS Code version: \`${this._productService.version}\`\n\n${message}`);
 +- VSCodium version: \`${this._productService.version}\`\n\n${message}`);
  
-diff --git a/src/vs/workbench/contrib/issue/browser/issue.ts b/src/vs/workbench/contrib/issue/browser/issue.ts
-index 79e4485..33f09a4 100644
---- a/src/vs/workbench/contrib/issue/browser/issue.ts
-+++ b/src/vs/workbench/contrib/issue/browser/issue.ts
-@@ -451,5 +451,5 @@ export class BaseIssueReporterService extends Disposable {
- 
--	public searchVSCodeIssues(title: string, issueDescription?: string): void {
-+	public searchVSCodeIssues(title: string, _issueDescription?: string): void {
+diff --git a/src/vs/workbench/contrib/issue/browser/baseIssueReporterService.ts b/src/vs/workbench/contrib/issue/browser/baseIssueReporterService.ts
+index 26d796b..1d1ff79 100644
+--- a/src/vs/workbench/contrib/issue/browser/baseIssueReporterService.ts
++++ b/src/vs/workbench/contrib/issue/browser/baseIssueReporterService.ts
+@@ -630,3 +630,3 @@ export class BaseIssueReporterService extends Disposable {
  		if (title) {
 -			this.searchDuplicates(title, issueDescription);
 +			this.searchGitHub('VSCodium/vscodium', title);
  		} else {
-@@ -545,33 +545,2 @@ export class BaseIssueReporterService extends Disposable {
+@@ -722,33 +722,2 @@ export class BaseIssueReporterService extends Disposable {
  
 -	@debounce(300)
 -	private searchDuplicates(title: string, body?: string): void {
@@ -53,20 +50,20 @@ index 79e4485..33f09a4 100644
 -	}
 -
  	private displaySearchResults(results: SearchResult[]) {
-@@ -667,4 +636,4 @@ export class BaseIssueReporterService extends Disposable {
+@@ -844,4 +813,4 @@ export class BaseIssueReporterService extends Disposable {
  		sourceSelect.append(this.makeOption('', localize('selectSource', "Select source"), true));
 -		sourceSelect.append(this.makeOption(IssueSource.VSCode, localize('vscode', "Visual Studio Code"), false));
 -		sourceSelect.append(this.makeOption(IssueSource.Extension, localize('extension', "A VS Code extension"), false));
 +		sourceSelect.append(this.makeOption(IssueSource.VSCode, localize('vscode', "VSCodium"), false));
 +		sourceSelect.append(this.makeOption(IssueSource.Extension, localize('extension', "A VSCodium extension"), false));
  		if (this.product.reportMarketplaceIssueUrl) {
-@@ -728,3 +697,3 @@ export class BaseIssueReporterService extends Disposable {
+@@ -905,3 +874,3 @@ export class BaseIssueReporterService extends Disposable {
  			hide(descriptionTextArea);
 -			reset(descriptionTitle, localize('handlesIssuesElsewhere', "This extension handles issues outside of VS Code"));
 +			reset(descriptionTitle, localize('handlesIssuesElsewhere', "This extension handles issues outside of VSCodium"));
  			reset(descriptionSubtitle, localize('elsewhereDescription', "The '{0}' extension prefers to use an external issue reporter. To be taken to that issue reporting experience, click the button below.", selectedExtension.displayName));
 diff --git a/src/vs/workbench/contrib/issue/browser/issueReporterModel.ts b/src/vs/workbench/contrib/issue/browser/issueReporterModel.ts
-index f8274d9..15fcc8b 100644
+index 0bbd8ac..4cffa1a 100644
 --- a/src/vs/workbench/contrib/issue/browser/issueReporterModel.ts
 +++ b/src/vs/workbench/contrib/issue/browser/issueReporterModel.ts
 @@ -92,3 +92,3 @@ ${this._data.issueDescription}
@@ -75,7 +72,7 @@ index f8274d9..15fcc8b 100644
 +VSCodium version: ${this._data.versionInfo && this._data.versionInfo.vscodeVersion}
  OS version: ${this._data.versionInfo && this._data.versionInfo.os}
 diff --git a/src/vs/workbench/contrib/issue/browser/issueReporterPage.ts b/src/vs/workbench/contrib/issue/browser/issueReporterPage.ts
-index 195857e..68163c0 100644
+index 5cbc709..5d6b1e2 100644
 --- a/src/vs/workbench/contrib/issue/browser/issueReporterPage.ts
 +++ b/src/vs/workbench/contrib/issue/browser/issueReporterPage.ts
 @@ -18,3 +18,3 @@ const reviewGuidanceLabel = localize( // intentionally not escaped because of it

patches/update-cache-path.patch

@@ -1,9 +1,9 @@
 diff --git a/src/vs/platform/update/electron-main/updateService.win32.ts b/src/vs/platform/update/electron-main/updateService.win32.ts
-index d45291e..74d4080 100644
+index a2561be..a50958e 100644
 --- a/src/vs/platform/update/electron-main/updateService.win32.ts
 +++ b/src/vs/platform/update/electron-main/updateService.win32.ts
-@@ -55,3 +55,3 @@ export class Win32UpdateService extends AbstractUpdateService {
+@@ -56,3 +56,3 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
  	get cachePath(): Promise<string> {
 -		const result = path.join(tmpdir(), `vscode-${this.productService.quality}-${this.productService.target}-${process.arch}`);
 +		const result = path.join(tmpdir(), `${this.productService.applicationName}-${this.productService.quality}-${this.productService.target}-${process.arch}`);
- 		return pfs.Promises.mkdir(result, { recursive: true }).then(() => result);
+ 		return fs.promises.mkdir(result, { recursive: true }).then(() => result);

patches/update-electron.patch

@@ -0,0 +1,192 @@
+diff --git a/.npmrc b/.npmrc
+index 22256e5..a6dfc1d 100644
+--- a/.npmrc
++++ b/.npmrc
+@@ -1,3 +1,3 @@
+ disturl="https://electronjs.org/headers"
+-target="32.2.6"
++target="32.2.7"
+ ms_build_id="10629634"
+diff --git a/build/checksums/electron.txt b/build/checksums/electron.txt
+index 17ec96f..ce17d8d 100644
+--- a/build/checksums/electron.txt
++++ b/build/checksums/electron.txt
+@@ -1,75 +1,75 @@
+-bb4164f7b554606b2c4daaf43e81bf2e2b5cf0d4441cfdd74f04653237fcf655 *chromedriver-v32.2.6-darwin-arm64.zip
+-a0fc3df1c6cd17bfe62ffbb1eba3655ca625dea5046e5d2b3dbb0e9e349cd10e *chromedriver-v32.2.6-darwin-x64.zip
+-671d6dab890747ea73ba5589327eef7612670950a20e5f88c7d8a301b5491e26 *chromedriver-v32.2.6-linux-arm64.zip
+-55bfd4e33fef1506261d4cb3074988e1970c2a762ca76a8f1197512a1766723c *chromedriver-v32.2.6-linux-armv7l.zip
+-d3c7a45c8c75152db927b3596f506995e72631df870b302b7dbcbd3399e54a3a *chromedriver-v32.2.6-linux-x64.zip
+-567f77d09708942901c6cdce6708b995f6ac779faceebb4ed383ca5003e2de4e *chromedriver-v32.2.6-mas-arm64.zip
+-b3a28181b1d077742f1be632a802e15b5a36a260b1cfe0e429735de9f52d074a *chromedriver-v32.2.6-mas-x64.zip
+-a113f5bd747b6eeb033f4d6ea2f53cf332d9b45d6340af514dd938bac7f99419 *chromedriver-v32.2.6-win32-arm64.zip
+-3b3237a788fad0a6be63a69b93c28b6052db23aeaa1a75d2589be15b4c2c0f2f *chromedriver-v32.2.6-win32-ia32.zip
+-1096c131cf8e3f98a01525e93d573eaf4fd23492d8dd78a211e39c448e69e463 *chromedriver-v32.2.6-win32-x64.zip
+-8e6fcf3171c3fcdcb117f641ec968bb53be3d38696e388636bf34f04c10b987d *electron-api.json
+-b1b20784a97e64992c92480e69af828a110d834372479b26759f1559b3da80fc *electron-v32.2.6-darwin-arm64-dsym-snapshot.zip
+-f11dd5a84229430ec59b4335415a4b308dc4330ff7b9febae20165fbdd862e92 *electron-v32.2.6-darwin-arm64-dsym.zip
+-cc96cf91f6b108dc927d8f7daee2fe27ae8a492c932993051508aa779e816445 *electron-v32.2.6-darwin-arm64-symbols.zip
+-fcb6bbb6aa3c1020b4045dbe9f2a5286173d5025248550f55631e70568e91775 *electron-v32.2.6-darwin-arm64.zip
+-d2bfeea27fc91936b4f71d0f5c577e5ad0ea094edba541dfa348948fd65c3331 *electron-v32.2.6-darwin-x64-dsym-snapshot.zip
+-5e7684cc12c0dee11fb933b68301d0fe68d3198d1daeadd5e1b4cf52743f79bf *electron-v32.2.6-darwin-x64-dsym.zip
+-6d2a7d41ab14fc7d3c5e4b35d5d425edb2d13978dcc332e781ec8b7bcfe6a794 *electron-v32.2.6-darwin-x64-symbols.zip
+-c0964ee5fdcefb1003ffd7ef574b07e5147856f3a94bb4335f78c409f8cf2eca *electron-v32.2.6-darwin-x64.zip
+-604d88b9d434ea66ddf234dd129dcef3d468b95b0da47e2f1555a682c8d0de28 *electron-v32.2.6-linux-arm64-debug.zip
+-f448e91df42fc84177bcd46378e49ee648f6114984fc57af4a84690a5197c23e *electron-v32.2.6-linux-arm64-symbols.zip
+-9e4f9345cae06e8e5679b228e7b7ac21b8733e3fcda8903e3dcbc8171c53f8be *electron-v32.2.6-linux-arm64.zip
+-604d88b9d434ea66ddf234dd129dcef3d468b95b0da47e2f1555a682c8d0de28 *electron-v32.2.6-linux-armv7l-debug.zip
+-c85d5ca3f38dc4140040bcde6a37ac9c7510bb542f12e1ffce695a35f68e3c13 *electron-v32.2.6-linux-armv7l-symbols.zip
+-df4b490a9c501d83c5305f20b2a9d1aa100d2e878e59ebafde477f21d35e3300 *electron-v32.2.6-linux-armv7l.zip
+-a5aa67da85ee318ff0770d55a506f62e6e5a10e967dfab272a94bcd91922e075 *electron-v32.2.6-linux-x64-debug.zip
+-671eb342a58e056f0dee5a6e9c69a6a96ee2141f81d306fa1a0e2635e22aa7c0 *electron-v32.2.6-linux-x64-symbols.zip
+-a3231409db7f8ac2cc446708f17e2abac0f8549c166eaab2f427e8d0f864208d *electron-v32.2.6-linux-x64.zip
+-8b8d0aeadcf21633216a9cce87d323ad6aa21e38ec82092cd5f65bf171be025f *electron-v32.2.6-mas-arm64-dsym-snapshot.zip
+-298931236955b83d174738d3325931e9672a8333bf854fc5f471168b0f7e70be *electron-v32.2.6-mas-arm64-dsym.zip
+-53e4c666a6f5f87aa150b1c2f34532e3711e00b0237fb103dcbef64d65979429 *electron-v32.2.6-mas-arm64-symbols.zip
+-bedbc78acc3bc6cb30e5fe1f133562104152022273ec21a83cd32a0eece9003f *electron-v32.2.6-mas-arm64.zip
+-9ba3def756c90460867d968af5417996991bf3b4b306dba4c9fbde43de2f771d *electron-v32.2.6-mas-x64-dsym-snapshot.zip
+-e4a3f9392934bb4ef82a214fec2ce1f319ea409b89bf03b2a2a4ab7a55688d0c *electron-v32.2.6-mas-x64-dsym.zip
+-55c54fd01faf5767493183001a440b837b63f8b8d64c36f7b42fa7217af36dcd *electron-v32.2.6-mas-x64-symbols.zip
+-1efe974cd426a288d617750c864e6edbf28495c3b851a5bc806af19cda7a274d *electron-v32.2.6-mas-x64.zip
+-88c50d34dc48a55a11014349d2d278f895f1615405614dbfcf27dff5f5030cf1 *electron-v32.2.6-win32-arm64-pdb.zip
+-b0b2211bf0f11924bcd693b6783627c7f6c9a066117bcf05c10766064c79794c *electron-v32.2.6-win32-arm64-symbols.zip
+-48b81d28fdceb4ab3ca27650d79bab910a1a19dbda72271882bfdc877c71975f *electron-v32.2.6-win32-arm64-toolchain-profile.zip
+-2b7962348f23410863cb6562d79654ce534666bab9f75965b5c8ebee61f49657 *electron-v32.2.6-win32-arm64.zip
+-d248ab4ec8b4a5aec414c7a404e0efd9b9a73083f7c5cb6c657c2ed58c4cbe94 *electron-v32.2.6-win32-ia32-pdb.zip
+-2ef98197d66d94aee4978047f22ba07538d259b25a8f5f301d9564a13649e72c *electron-v32.2.6-win32-ia32-symbols.zip
+-48b81d28fdceb4ab3ca27650d79bab910a1a19dbda72271882bfdc877c71975f *electron-v32.2.6-win32-ia32-toolchain-profile.zip
+-e85dbf85d58cab5b06cdb8e76fde3a25306e7c1808f5bb30925ba7e29ff14d13 *electron-v32.2.6-win32-ia32.zip
+-9d76b0c0d475cc062b2a951fbfb3b17837880102fb6cc042e2736dfebbfa0e5d *electron-v32.2.6-win32-x64-pdb.zip
+-3d7b93bafc633429f5c9f820bcb4843d504b12e454b3ecebb1b69c15b5f4080f *electron-v32.2.6-win32-x64-symbols.zip
+-48b81d28fdceb4ab3ca27650d79bab910a1a19dbda72271882bfdc877c71975f *electron-v32.2.6-win32-x64-toolchain-profile.zip
+-77d5e5b76b49767e6a3ad292dc315fbc7cdccd557ac38da9093b8ac6da9262d5 *electron-v32.2.6-win32-x64.zip
+-a52935712eb4fc2c12ac4ae611a57e121da3b6165c2de1abd7392ed4261287e2 *electron.d.ts
+-6345ea55fda07544434c90c276cdceb2662044b9e0355894db67ca95869af22a *ffmpeg-v32.2.6-darwin-arm64.zip
+-4c1347e8653727513a22be013008c2760d19200977295b98506b3b9947e74090 *ffmpeg-v32.2.6-darwin-x64.zip
+-3f1eafaf4cd90ab43ba0267429189be182435849a166a2cbe1faefc0d07217c4 *ffmpeg-v32.2.6-linux-arm64.zip
+-3db919bc57e1a5bf7c1bae1d7aeacf4a331990ea82750391c0b24a046d9a2812 *ffmpeg-v32.2.6-linux-armv7l.zip
+-fe7d779dddbfb5da5999a7607fc5e3c7a6ab7c65e8da9fee1384918865231612 *ffmpeg-v32.2.6-linux-x64.zip
+-e09ae881113d1b3103aec918e7c95c36f82b2db63657320c380c94386f689138 *ffmpeg-v32.2.6-mas-arm64.zip
+-ee316e435662201a81fcededc62582dc87a0bd5c9fd0f6a8a55235eca806652f *ffmpeg-v32.2.6-mas-x64.zip
+-415395968d31e13056cefcb589ed550a0e80d7c3d0851ee3ba29e4dcdf174210 *ffmpeg-v32.2.6-win32-arm64.zip
+-17f61a5293b707c984cee52b57a7e505cde994d22828e31c016434521638e419 *ffmpeg-v32.2.6-win32-ia32.zip
+-f9b47951a553eec21636b3cc15eccf0a2ba272567146ec8a6e2eeb91a985fd62 *ffmpeg-v32.2.6-win32-x64.zip
+-7d2b596bd94e4d5c7befba11662dc563a02f18c183da12ebd56f38bb6f4382e9 *hunspell_dictionaries.zip
+-06bca9a33142b5834fbca6d10d7f3303b0b5c52e7222fe783db109cd4c5260ed *libcxx-objects-v32.2.6-linux-arm64.zip
+-7ab8ff5a4e1d3a6639978ed718d2732df9c1a4dd4dcd3e18f6746a2168d353a9 *libcxx-objects-v32.2.6-linux-armv7l.zip
+-ba96792896751e11fdba63e5e336e323979986176aa1848122ca3757c854352e *libcxx-objects-v32.2.6-linux-x64.zip
+-1f858d484f4ce27f9f3c4a120b2881f88c17c81129ca10e495b50398fb2eed64 *libcxx_headers.zip
+-4566afb06a6dd8bd895dba5350a5705868203321116a1ae0a216d5a4a6bfb289 *libcxxabi_headers.zip
+-350f5419c14aede5802c4f0ef5204ddbbe0eb7d5263524da38d19f43620d8530 *mksnapshot-v32.2.6-darwin-arm64.zip
+-9f4e4943df4502943994ffa17525b7b5b9a1d889dbc5aeb28bfc40f9146323ec *mksnapshot-v32.2.6-darwin-x64.zip
+-6295ad1a4ab3b24ac99ec85d35ebfce3861e58185b94d20077e364e81ad935f8 *mksnapshot-v32.2.6-linux-arm64-x64.zip
+-ed9e1931165a2ff85c1af9f10b3bf8ba05d2dae31331d1d4f5ff1512078e4411 *mksnapshot-v32.2.6-linux-armv7l-x64.zip
+-6680c63b11e4638708d88c130474ceb2ee92fc58c62cfcd3bf33dda9fee771c2 *mksnapshot-v32.2.6-linux-x64.zip
+-5a4c45b755b7bbdcad51345f5eb2935ba988987650f9b8540c7ef04015207a2f *mksnapshot-v32.2.6-mas-arm64.zip
+-1e6243d6a1b68f327457b9dae244ffaeadc265b07a99d9c36f1abcff31e36856 *mksnapshot-v32.2.6-mas-x64.zip
+-407099537b17860ce7dcea6ba582a854314c29dc152a6df0abcc77ebb0187b4c *mksnapshot-v32.2.6-win32-arm64-x64.zip
+-f9107536378e19ae9305386dacf6fae924c7ddaad0cf0a6f49694e1e8af6ded5 *mksnapshot-v32.2.6-win32-ia32.zip
+-82a142db76a2cc5dfb9a89e4cd721cfebc0f3077d2415d8f3d86bb7411f0fe27 *mksnapshot-v32.2.6-win32-x64.zip
++0729d2cb830425c4591b40d7189c2f7da020f5adb887a49a4faa022d551b1e6f *chromedriver-v32.2.7-darwin-arm64.zip
++a7d61c68d3b3522c0ec383915b6ab3d9f269d9ada0e09aa87a4e7d9fc24fe928 *chromedriver-v32.2.7-darwin-x64.zip
++45314c8c7127f6083469c2c067aa78beb20055ba4d7a63eb2108b27e594a647a *chromedriver-v32.2.7-linux-arm64.zip
++7e976a7131dcfd55f781c073ae59c8a24a1393119d831fbac13c6a335eb71467 *chromedriver-v32.2.7-linux-armv7l.zip
++3437feb5d8e7157476d2e7a6558346061cd7e46506874bc7870eed8a3a43642a *chromedriver-v32.2.7-linux-x64.zip
++3737301add80a936374acb17b84bb3a715fab9fbce049816ea7a51fa53d3b35e *chromedriver-v32.2.7-mas-arm64.zip
++8b8b62f48a5e8b8a340b47348a2cc5dd4ba38789f76bc5567c039587538081a9 *chromedriver-v32.2.7-mas-x64.zip
++24b666e3ab41eb1c66ab0f2361af0529b2b8e1e5ef153cfcef36adc700f9ed6d *chromedriver-v32.2.7-win32-arm64.zip
++6d40251661afb1835adbef85e317fd520c0f1378156614c82befb348c3122c2d *chromedriver-v32.2.7-win32-ia32.zip
++483012da9903d8d75e5e251a3262667c9a0a012a492b93dbe1237c7827eba778 *chromedriver-v32.2.7-win32-x64.zip
++1e9b2b9011f56fa26f4d9fa57254ef1d0bdb34405a9bdf83a652f6258347e46d *electron-api.json
++c0ea4a21f2e7e946300bf587a4e31f72ef996c497eaa94e6b8f788b917b896e5 *electron-v32.2.7-darwin-arm64-dsym-snapshot.zip
++1e6e84e56cfb3a2473cab41577c160d3afcbda8337dda17c5295da90266433c9 *electron-v32.2.7-darwin-arm64-dsym.zip
++9f460100fb71ef098bec26e9a09978ec1b1663165d6a358bfc398f5548a844c3 *electron-v32.2.7-darwin-arm64-symbols.zip
++71e76a0a81a0c1c10e9e4862caf96437ba85a18c8fa7d8e15d59e3c057b893bd *electron-v32.2.7-darwin-arm64.zip
++e406d690365f332826843c86c6a1b5c0320a84b0527ad8700a0e995b12a35f8c *electron-v32.2.7-darwin-x64-dsym-snapshot.zip
++53d6fb64d717af80f024284161a432aaffb47631ef7548f18f33016c3376871a *electron-v32.2.7-darwin-x64-dsym.zip
++3c9187db2cc0570d7b01651fa78294df7d451c87c361335cee80a61c1c561b67 *electron-v32.2.7-darwin-x64-symbols.zip
++34310ed51d32b6c02ba3e3f447b0807ea85804d1f2b239e02a9de58b9080fbf8 *electron-v32.2.7-darwin-x64.zip
++e884f2f9f3d001488888929b8affe053a60a7a780af7d0ec8d7023023f40ca52 *electron-v32.2.7-linux-arm64-debug.zip
++fd88e47e7b564b006f68641b5c328721bbc8d87cfc9e569d9733354d263cddee *electron-v32.2.7-linux-arm64-symbols.zip
++fb6e1f24385c3058844bd768320d5b332b4cbd011ab930e7252dc330c8ee17b3 *electron-v32.2.7-linux-arm64.zip
++e884f2f9f3d001488888929b8affe053a60a7a780af7d0ec8d7023023f40ca52 *electron-v32.2.7-linux-armv7l-debug.zip
++f338ea7ea592c3ccdad1bb788e9b936610f825ac69290e48d394790d5266dce3 *electron-v32.2.7-linux-armv7l-symbols.zip
++4a95643e88cadfb011354d25cafe242cdb8c5327d65f86b4fbabe64717367ed2 *electron-v32.2.7-linux-armv7l.zip
++e6e0fce9f6d95a84653b537b741967cae48c4c70c8026c02293c979074225b46 *electron-v32.2.7-linux-x64-debug.zip
++122cc565d0ccd2774e298645473869752d27d2632aa97583d93b499e9b02f22b *electron-v32.2.7-linux-x64-symbols.zip
++98007545e1d3700b32de5cb5eebcc10b9d105fb0dad6396155fdab1b40abb638 *electron-v32.2.7-linux-x64.zip
++556d9ca239ee1206c9d67affa836ebb651db88eea6bee48cb7b43fa75851c72d *electron-v32.2.7-mas-arm64-dsym-snapshot.zip
++662a3742b94fcbf7ab91a7c20e1430825ae7852e915fcb558d6357a310d631c6 *electron-v32.2.7-mas-arm64-dsym.zip
++edd0763ead7ffd5bf5072539e5ca0be9252b9590e674e6e44e69b2057c329d79 *electron-v32.2.7-mas-arm64-symbols.zip
++a4483f5246ecadfa48b1fc671d92b5dfbc09fbd88fe386f2ce48f10de79f2127 *electron-v32.2.7-mas-arm64.zip
++a9aad4c413d4851fa3463eeef7015e3a3e77a501192965db1c5b870fa31a9660 *electron-v32.2.7-mas-x64-dsym-snapshot.zip
++96c20e5c4b73febd3458679e9cc939f5f8255a327b06f49188ab2e3fe8311ea3 *electron-v32.2.7-mas-x64-dsym.zip
++6ac844957373114e04411d3af1cb6507e35174d1dc279cce41cb92bbf2ea5d26 *electron-v32.2.7-mas-x64-symbols.zip
++888b830b991dab6cf2c4351e112a48f24a4748efefcd763d693a79161199e65a *electron-v32.2.7-mas-x64.zip
++27759db6bcdd16d4ff5548684361ba4372d885d3142bf02db59837c3634b1934 *electron-v32.2.7-win32-arm64-pdb.zip
++6019e6ec58e9b6da335f20874efebc42d034a179163180b3b6faedf2963ae577 *electron-v32.2.7-win32-arm64-symbols.zip
++48b81d28fdceb4ab3ca27650d79bab910a1a19dbda72271882bfdc877c71975f *electron-v32.2.7-win32-arm64-toolchain-profile.zip
++2c755fdd4f9fda618b2db6b8c7210c5f3106a88b1e87b83e8433b4ab4a628cc2 *electron-v32.2.7-win32-arm64.zip
++4dce0b21d1c2093cc4f7c0eaf9453a38377e0076d811da3c7391f105fc1d6afb *electron-v32.2.7-win32-ia32-pdb.zip
++9a0a9c3746cd40ddc9c926755633b16676714e2138d7a2d888f658a26f617039 *electron-v32.2.7-win32-ia32-symbols.zip
++48b81d28fdceb4ab3ca27650d79bab910a1a19dbda72271882bfdc877c71975f *electron-v32.2.7-win32-ia32-toolchain-profile.zip
++6c338c5cd0b0587349ab0f119ca8f7d2728b1c3a43fe241741087f5fdf139c9c *electron-v32.2.7-win32-ia32.zip
++fa240d324c5376aa12ed2aef26597764d9bfc2fdd0d16d7f76afc2c3e3c65a29 *electron-v32.2.7-win32-x64-pdb.zip
++f645b53771cbcdfaa041d9cf9581348821d82c1b185ddb913759e2d62ee2410a *electron-v32.2.7-win32-x64-symbols.zip
++48b81d28fdceb4ab3ca27650d79bab910a1a19dbda72271882bfdc877c71975f *electron-v32.2.7-win32-x64-toolchain-profile.zip
++819ab19b7111dfd39dff506b3cb5cd2e1d8f4bb17f96ba74b987b2eac14b6c63 *electron-v32.2.7-win32-x64.zip
++ce41b10c28bd43249cd3b409e081b1c83a2b691381bdd2e3bf208ec40ca176b8 *electron.d.ts
++d2491071a641ce2e0f63c1f52e3a412856dd83ca17d021af1166d6e5b4de5638 *ffmpeg-v32.2.7-darwin-arm64.zip
++5c5589b2c93f834e595eb692aa768b934245d2631df69bc4cad3a6602bba0e67 *ffmpeg-v32.2.7-darwin-x64.zip
++3f1eafaf4cd90ab43ba0267429189be182435849a166a2cbe1faefc0d07217c4 *ffmpeg-v32.2.7-linux-arm64.zip
++3db919bc57e1a5bf7c1bae1d7aeacf4a331990ea82750391c0b24a046d9a2812 *ffmpeg-v32.2.7-linux-armv7l.zip
++fe7d779dddbfb5da5999a7607fc5e3c7a6ab7c65e8da9fee1384918865231612 *ffmpeg-v32.2.7-linux-x64.zip
++feeef1ab10543c813f730cc7a482b43eda35d40f1285b950e1a6d7805db2332a *ffmpeg-v32.2.7-mas-arm64.zip
++96ef45180589c854fedf2d0601a20e70a65220c0820c45d0dfd4ec64724c58e0 *ffmpeg-v32.2.7-mas-x64.zip
++ab4ab9cd62e40c4d3064004caa9de680cb72d8180d4facc1be06bdc886c23410 *ffmpeg-v32.2.7-win32-arm64.zip
++90b5e2ebd4ff683eda97cc43ebbdee9b133b27edd2a34ae7ef37e7969d1d68be *ffmpeg-v32.2.7-win32-ia32.zip
++8452085c0a650035f30a4b76e2ce1791f9b392ea7262109d29f7fe383fc41ddb *ffmpeg-v32.2.7-win32-x64.zip
++78b415ebb9040dacabb6eb776a8d4837dda9a9b1ec9d64ee15db28dbb8598862 *hunspell_dictionaries.zip
++a30057c37e6be5732944084575a2278616297242ae51bd474c683263cbc0c3e4 *libcxx-objects-v32.2.7-linux-arm64.zip
++f9e9d1ff1a03a3e609ab8e727b1f89e77934509a4afdb849698b70e701c2176f *libcxx-objects-v32.2.7-linux-armv7l.zip
++bb66e3b48f8e0706126b2b8b08827a4adda6f56c509eae4d136fcffd5414c353 *libcxx-objects-v32.2.7-linux-x64.zip
++5181518d7da83fea5d8b033ab4fb7ed300f73bd8d20b8c26b624128233bd6ab2 *libcxx_headers.zip
++6030ad099859b62cbdd9021b2cdb453a744a2751cb1dab30519e3e8708ad72d6 *libcxxabi_headers.zip
++d3dcc4925a6bd55bc305fd41805ffee77dc8821730ac75cf4ee9ed2ca4ebdccb *mksnapshot-v32.2.7-darwin-arm64.zip
++e6dfad3c30f4f38509b2fc972dd05cef06142c4832d931edba19742e06161279 *mksnapshot-v32.2.7-darwin-x64.zip
++25ba5be47a721700f16af10945e71408ed86ffd6800b5d5ef04d38c0d77aa446 *mksnapshot-v32.2.7-linux-arm64-x64.zip
++f7e8b50691712206587d81844bd63271f2dd49253c946a5b66bd6f169ccf94d6 *mksnapshot-v32.2.7-linux-armv7l-x64.zip
++a0b119abe93c0231601b6c699cce4b78e89def766c24f9a8a06cfab3feca8f6c *mksnapshot-v32.2.7-linux-x64.zip
++e3e8a496a1eaf6c8ce623fa4b139e5458cf3ce3702ea3560cded839087b60792 *mksnapshot-v32.2.7-mas-arm64.zip
++c03219273c82022c29e277d07ce1d0980d25c22d39269fa3eef9547f57ec410b *mksnapshot-v32.2.7-mas-x64.zip
++7684cb9c6f621db05b6e68080fade81f46d0ff8eeac94080bd635f035069d13e *mksnapshot-v32.2.7-win32-arm64-x64.zip
++f7ca1d557e3d0f878b13f57dc0e00932f7a97f3dd0f0cc3bbbd565a06718bd17 *mksnapshot-v32.2.7-win32-ia32.zip
++d9d8dd33561eb648e5ebd00f99418122d9a915ec63fe967e7cb0ff64ef8ee199 *mksnapshot-v32.2.7-win32-x64.zip
+\ No newline at end of file
+diff --git a/package-lock.json b/package-lock.json
+index b4c9991..24303fc 100644
+--- a/package-lock.json
++++ b/package-lock.json
+@@ -97,3 +97,3 @@
+         "deemon": "^1.8.0",
+-        "electron": "32.2.6",
++        "electron": "32.2.7",
+         "eslint": "^9.11.1",
+@@ -5817,5 +5817,5 @@
+     "node_modules/electron": {
+-      "version": "32.2.6",
+-      "resolved": "https://registry.npmjs.org/electron/-/electron-32.2.6.tgz",
+-      "integrity": "sha512-aGG1MLvWCf+ECUFBCmaCF52F8312OPAJfph2D0FSsFmlbfnJuNevZCbty2lFzsiIMtU7/QRo6d0ksbgR4s7y3w==",
++      "version": "32.2.7",
++      "resolved": "https://registry.npmjs.org/electron/-/electron-32.2.7.tgz",
++      "integrity": "sha512-y8jbQRG3xogF70XPlk5c+dWe5iRfUBo28o2NMpKd/CcW7ENIaWtBlGima8/8nmRdAaYTy1+yIt6KB0Lon9H8cA==",
+       "dev": true,
+diff --git a/package.json b/package.json
+index f7a7f68..a74c7ad 100644
+--- a/package.json
++++ b/package.json
+@@ -155,3 +155,3 @@
+     "deemon": "^1.8.0",
+-    "electron": "32.2.6",
++    "electron": "32.2.7",
+     "eslint": "^9.11.1",

patches/update-msi.patch

@@ -1,9 +0,0 @@
-diff --git a/src/vs/platform/update/electron-main/updateService.win32.ts b/src/vs/platform/update/electron-main/updateService.win32.ts
-index 4c49a75..7840d2a 100644
---- a/src/vs/platform/update/electron-main/updateService.win32.ts
-+++ b/src/vs/platform/update/electron-main/updateService.win32.ts
-@@ -270,3 +270,3 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
- 
--		const fastUpdatesEnabled = this.configurationService.getValue('update.enableWindowsBackgroundUpdates');
-+		const fastUpdatesEnabled = getUpdateType() == UpdateType.Setup && this.configurationService.getValue('update.enableWindowsBackgroundUpdates');
- 		const update: IUpdate = { version: 'unknown', productVersion: 'unknown' };

patches/update-windows.patch

@@ -1,67 +0,0 @@
-diff --git a/src/vs/platform/update/common/update.ts b/src/vs/platform/update/common/update.ts
-index 0f79e17..97ea778 100644
---- a/src/vs/platform/update/common/update.ts
-+++ b/src/vs/platform/update/common/update.ts
-@@ -48,3 +48,4 @@ export const enum UpdateType {
- 	Archive,
--	Snap
-+	Snap,
-+	WindowsInstaller,
- }
-diff --git a/src/vs/platform/update/electron-main/updateService.win32.ts b/src/vs/platform/update/electron-main/updateService.win32.ts
-index 99bf807..27e77f0 100644
---- a/src/vs/platform/update/electron-main/updateService.win32.ts
-+++ b/src/vs/platform/update/electron-main/updateService.win32.ts
-@@ -41,5 +41,9 @@ function getUpdateType(): UpdateType {
- 	if (typeof _updateType === 'undefined') {
--		_updateType = fs.existsSync(path.join(path.dirname(process.execPath), 'unins000.exe'))
--			? UpdateType.Setup
--			: UpdateType.Archive;
-+		if (fs.existsSync(path.join(path.dirname(process.execPath), 'unins000.exe'))) {
-+			_updateType = UpdateType.Setup;
-+		} else if (path.basename(path.normalize(path.join(process.execPath, '..', '..'))) === 'Program Files') {
-+			_updateType = UpdateType.WindowsInstaller;
-+		} else {
-+			_updateType = UpdateType.Archive;
-+		}
- 	}
-@@ -103,6 +107,16 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
- 
--		if (getUpdateType() === UpdateType.Archive) {
--			platform += '-archive';
--		} else if (this.productService.target === 'user') {
--			platform += '-user';
-+		switch (getUpdateType()) {
-+			case UpdateType.Archive:
-+				platform += '-archive';
-+				break;
-+			case UpdateType.WindowsInstaller:
-+				platform += '-msi';
-+				break;
-+			default:
-+				if (this.productService.target === 'user') {
-+					platform += '-user';
-+				}
-+				else {
-+					platform += '-system';
-+				}
- 		}
-@@ -257,6 +271,14 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
- 		} else {
--			spawn(this.availableUpdate.packagePath, ['/silent', '/log', '/mergetasks=runcode,!desktopicon,!quicklaunchicon'], {
--				detached: true,
--				stdio: ['ignore', 'ignore', 'ignore']
--			});
-+			const type = getUpdateType();
-+			if (type == UpdateType.WindowsInstaller) {
-+				spawn('msiexec.exe', ['/i', this.availableUpdate.packagePath], {
-+					detached: true,
-+					stdio: ['ignore', 'ignore', 'ignore']
-+				});
-+			} else {
-+				spawn(this.availableUpdate.packagePath, ['/silent', '/log', '/mergetasks=runcode,!desktopicon,!quicklaunchicon'], {
-+					detached: true,
-+					stdio: ['ignore', 'ignore', 'ignore']
-+				});
-+			}
- 		}

patches/version-0-release.patch

@@ -1,69 +1,71 @@
 diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
-index 595d0ce..99bfe30 100644
+index 4f00317..e5d08e5 100644
 --- a/build/gulpfile.reh.js
 +++ b/build/gulpfile.reh.js
-@@ -290,4 +290,5 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
+@@ -307,2 +307,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
  		const name = product.nameShort;
 +		const release = packageJson.release;
+ 
+@@ -310,3 +311,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
  		const packageJsonStream = gulp.src(['remote/package.json'], { base: 'remote' })
--			.pipe(json({ name, version, dependencies: undefined, optionalDependencies: undefined }));
-+			.pipe(json({ name, version, release, dependencies: undefined, optionalDependencies: undefined }));
- 
-@@ -296,3 +297,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
+-			.pipe(json({ name, version, dependencies: undefined, optionalDependencies: undefined, type: 'module' }))
++			.pipe(json({ name, version, release, dependencies: undefined, optionalDependencies: undefined, type: 'module' }))
+ 			.pipe(es.through(function (file) {
+@@ -318,3 +319,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
  		const productJsonStream = gulp.src(['product.json'], { base: '.' })
--			.pipe(json({ commit, date, version }));
-+			.pipe(json({ commit, date, version, release }));
- 
+-			.pipe(json({ commit, date: readISODate('out-build'), version }))
++			.pipe(json({ commit, date: readISODate('out-build'), version, release }))
+ 			.pipe(es.through(function (file) {
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index e1507e0..9a12a12 100644
+index 030c39a..51772c9 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -233,3 +233,3 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -261,3 +261,3 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  
 -		let version = packageJson.version;
 +		let version = packageJson.version
  		const quality = product.quality;
-@@ -241,3 +241,4 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -269,3 +269,4 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  		const name = product.nameShort;
 -		const packageJsonUpdates = { name, version };
 +		const release = packageJson.release;
 +		const packageJsonUpdates = { name, version, release };
  
-@@ -252,3 +253,3 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
- 		const date = new Date().toISOString();
--		const productJsonUpdate = { commit, date, checksums, version };
-+		const productJsonUpdate = { commit, date, checksums, version, release };
- 
+@@ -285,3 +286,3 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+ 		const productJsonStream = gulp.src(['product.json'], { base: '.' })
+-			.pipe(json({ commit, date: readISODate('out-build'), checksums, version }))
++			.pipe(json({ commit, date: readISODate('out-build'), checksums, version, release }))
+ 			.pipe(es.through(function (file) {
 diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js
-index 8c2b62f..303fb16 100644
+index fb0e5a4..170c60b 100644
 --- a/build/gulpfile.vscode.linux.js
 +++ b/build/gulpfile.vscode.linux.js
-@@ -24,4 +24,2 @@ const commit = getVersion(root);
+@@ -27,4 +27,2 @@ const commit = getVersion(root);
  
 -const linuxPackageRevision = Math.floor(new Date().getTime() / 1000);
 -
  /**
-@@ -86,3 +84,3 @@ function prepareDebPackage(arch) {
+@@ -89,3 +87,3 @@ function prepareDebPackage(arch) {
  					.pipe(replace('@@NAME@@', product.applicationName))
 -					.pipe(replace('@@VERSION@@', packageJson.version + '-' + linuxPackageRevision))
 +					.pipe(replace('@@VERSION@@', `${packageJson.version}.${packageJson.release}`))
  					.pipe(replace('@@ARCHITECTURE@@', debArch))
-@@ -194,4 +192,3 @@ function prepareRpmPackage(arch) {
+@@ -204,4 +202,3 @@ function prepareRpmPackage(arch) {
  					.pipe(replace('@@ICON@@', product.linuxIconName))
 -					.pipe(replace('@@VERSION@@', packageJson.version))
 -					.pipe(replace('@@RELEASE@@', linuxPackageRevision))
 +					.pipe(replace('@@VERSION@@', `${packageJson.version}.${packageJson.release}`))
  					.pipe(replace('@@ARCHITECTURE@@', rpmArch))
-@@ -270,3 +267,3 @@ function prepareSnapPackage(arch) {
+@@ -281,3 +278,3 @@ function prepareSnapPackage(arch) {
  			.pipe(replace('@@NAME@@', product.applicationName))
 -			.pipe(replace('@@VERSION@@', commit.substr(0, 8)))
 +			.pipe(replace('@@VERSION@@', `${packageJson.version}.${packageJson.release}`))
  			// Possible run-on values https://snapcraft.io/docs/architectures
 diff --git a/build/gulpfile.vscode.win32.js b/build/gulpfile.vscode.win32.js
-index 5adfdfb..d6ddead 100644
+index 98175f5..afacbe3 100644
 --- a/build/gulpfile.vscode.win32.js
 +++ b/build/gulpfile.vscode.win32.js
-@@ -90,4 +90,4 @@ function buildWin32Setup(arch, target) {
+@@ -89,4 +89,4 @@ function buildWin32Setup(arch, target) {
  			DirName: product.win32DirName,
 -			Version: pkg.version,
 -			RawVersion: pkg.version.replace(/-\w+$/, ''),
@@ -71,7 +73,7 @@ index 5adfdfb..d6ddead 100644
 +			RawVersion: `${pkg.version.replace(/-\w+$/, '')}.${pkg.release}`,
  			NameVersion: product.win32NameVersion + (target === 'user' ? ' (User)' : ''),
 diff --git a/src/vs/base/common/product.ts b/src/vs/base/common/product.ts
-index 3a57612..d26a55b 100644
+index ac7c552..8cfc209 100644
 --- a/src/vs/base/common/product.ts
 +++ b/src/vs/base/common/product.ts
 @@ -58,2 +58,3 @@ export interface IProductConfiguration {
@@ -79,16 +81,16 @@ index 3a57612..d26a55b 100644
 +	readonly release: string;
  	readonly date?: string;
 diff --git a/src/vs/platform/diagnostics/node/diagnosticsService.ts b/src/vs/platform/diagnostics/node/diagnosticsService.ts
-index 0be311f..d6c4a18 100644
+index 5f6efd5..da3c54d 100644
 --- a/src/vs/platform/diagnostics/node/diagnosticsService.ts
 +++ b/src/vs/platform/diagnostics/node/diagnosticsService.ts
-@@ -224,3 +224,3 @@ export class DiagnosticsService implements IDiagnosticsService {
+@@ -232,3 +232,3 @@ export class DiagnosticsService implements IDiagnosticsService {
  		const output: string[] = [];
 -		output.push(`Version:          ${this.productService.nameShort} ${this.productService.version} (${this.productService.commit || 'Commit unknown'}, ${this.productService.date || 'Date unknown'})`);
 +		output.push(`Version:          ${this.productService.nameShort} ${this.productService.version} ${this.productService.release || 'Release unknown'} (${this.productService.commit || 'Commit unknown'}, ${this.productService.date || 'Date unknown'})`);
  		output.push(`OS Version:       ${osLib.type()} ${osLib.arch()} ${osLib.release()}`);
 diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts
-index 467e11c..8e7d474 100644
+index 1a2a619..2a8d683 100644
 --- a/src/vs/platform/product/common/product.ts
 +++ b/src/vs/platform/product/common/product.ts
 @@ -43,6 +43,7 @@ else if (globalThis._VSCODE_PRODUCT_JSON && globalThis._VSCODE_PACKAGE_JSON) {
@@ -102,19 +104,19 @@ index 467e11c..8e7d474 100644
 +			release: pkg.release
  		});
 diff --git a/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts b/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
-index c064ebc..72a9fa9 100644
+index 039233d..c8ced77 100644
 --- a/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
 +++ b/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
-@@ -22,2 +22,3 @@ import { defaultButtonStyles, defaultCheckboxStyles, defaultDialogStyles, defaul
- import { ResultKind } from 'vs/platform/keybinding/common/keybindingResolver';
-+import { getReleaseString } from 'vs/workbench/common/release';
+@@ -23,2 +23,3 @@ import { ResultKind } from '../../../../platform/keybinding/common/keybindingRes
+ import { CancellationToken } from '../../../../base/common/cancellation.js';
++import { getReleaseString } from '../../../../workbench/common/release.js';
  
-@@ -79,2 +80,4 @@ export class BrowserDialogHandler extends AbstractDialogHandler {
+@@ -80,2 +81,4 @@ export class BrowserDialogHandler extends AbstractDialogHandler {
  		const detailString = (useAgo: boolean): string => {
 +			const releaseString = getReleaseString();
 +
  			return localize('aboutDetail',
-@@ -85,3 +88,3 @@ export class BrowserDialogHandler extends AbstractDialogHandler {
+@@ -86,3 +89,3 @@ export class BrowserDialogHandler extends AbstractDialogHandler {
  				navigator.userAgent
 -			);
 +			).replace('\n', `\n${releaseString} ${this.productService.release || 'Unknown'}\n`);
@@ -140,13 +142,13 @@ index 0000000..2a8ea57
 +	return LABELS[language] ?? DEFAULT_LABEL;
 +}
 diff --git a/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts b/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts
-index f2cc82a..700d81a 100644
+index 6c61a59..e76a188 100644
 --- a/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts
 +++ b/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts
-@@ -14,2 +14,3 @@ import { IProductService } from 'vs/platform/product/common/productService';
- import { process } from 'vs/base/parts/sandbox/electron-sandbox/globals';
-+import { getReleaseString } from 'vs/workbench/common/release';
- import { getActiveWindow } from 'vs/base/browser/dom';
+@@ -15,2 +15,3 @@ import { process } from '../../../../base/parts/sandbox/electron-sandbox/globals
+ import { getActiveWindow } from '../../../../base/browser/dom.js';
++import { getReleaseString } from '../../../../workbench/common/release';
+ 
 @@ -80,2 +81,3 @@ export class NativeDialogHandler extends AbstractDialogHandler {
  		const osProps = await this.nativeHostService.getOSProperties();
 +		const releaseString = getReleaseString();

patches/version-1-update.patch

@@ -0,0 +1,235 @@
+diff --git a/src/vs/platform/update/common/update.ts b/src/vs/platform/update/common/update.ts
+index 199f433..a6cbb10 100644
+--- a/src/vs/platform/update/common/update.ts
++++ b/src/vs/platform/update/common/update.ts
+@@ -51,3 +51,4 @@ export const enum UpdateType {
+ 	Archive,
+-	Snap
++	Snap,
++	WindowsInstaller,
+ }
+@@ -110 +111,38 @@ export interface IUpdateService {
+ }
++
++export type Architecture =
++	| "arm"
++	| "arm64"
++	| "ia32"
++	| "loong64"
++	| "mips"
++	| "mipsel"
++	| "ppc"
++	| "ppc64"
++	| "riscv64"
++	| "s390"
++	| "s390x"
++	| "x64";
++
++export type Platform =
++	| "aix"
++	| "android"
++	| "darwin"
++	| "freebsd"
++	| "haiku"
++	| "linux"
++	| "openbsd"
++	| "sunos"
++	| "win32"
++	| "cygwin"
++	| "netbsd";
++
++export type Quality =
++	| "insider"
++	| "stable";
++
++export type Target =
++	| "archive"
++	| "msi"
++	| "system"
++	| "user";
+\ No newline at end of file
+diff --git a/src/vs/platform/update/electron-main/abstractUpdateService.ts b/src/vs/platform/update/electron-main/abstractUpdateService.ts
+index 48638aa..8f738e7 100644
+--- a/src/vs/platform/update/electron-main/abstractUpdateService.ts
++++ b/src/vs/platform/update/electron-main/abstractUpdateService.ts
+@@ -14,6 +14,10 @@ import { IProductService } from '../../product/common/productService.js';
+ import { IRequestService } from '../../request/common/request.js';
+-import { AvailableForDownload, DisablementReason, IUpdateService, State, StateType, UpdateType } from '../common/update.js';
++import { Architecture, AvailableForDownload, DisablementReason, IUpdateService, Platform, State, StateType, Target, UpdateType } from '../common/update.js';
+ 
+-export function createUpdateURL(platform: string, quality: string, productService: IProductService): string {
+-	return `${productService.updateUrl}/api/update/${platform}/${quality}/${productService.commit}`;
++export function createUpdateURL(productService: IProductService, quality: string, platform: Platform, architecture: Architecture, target?: Target): string {
++	if (target) {
++		return `${productService.updateUrl}/${quality}/${platform}/${architecture}/${target}/latest.json`;
++	} else {
++		return `${productService.updateUrl}/${quality}/${platform}/${architecture}/latest.json`;
++	}
+ }
+diff --git a/src/vs/platform/update/electron-main/updateService.darwin.ts b/src/vs/platform/update/electron-main/updateService.darwin.ts
+index d3f27d3..8454ff3 100644
+--- a/src/vs/platform/update/electron-main/updateService.darwin.ts
++++ b/src/vs/platform/update/electron-main/updateService.darwin.ts
+@@ -15,3 +15,3 @@ import { ILogService } from '../../log/common/log.js';
+ import { IProductService } from '../../product/common/productService.js';
+-import { IRequestService } from '../../request/common/request.js';
++import { IRequestService, asJson } from '../../request/common/request.js';
+ import { ITelemetryService } from '../../telemetry/common/telemetry.js';
+@@ -19,2 +19,4 @@ import { IUpdate, State, StateType, UpdateType } from '../common/update.js';
+ import { AbstractUpdateService, createUpdateURL, UpdateErrorClassification, UpdateNotAvailableClassification } from './abstractUpdateService.js';
++import { CancellationToken } from '../../../base/common/cancellation.js';
++import * as semver from 'semver';
+ 
+@@ -76,9 +78,3 @@ export class DarwinUpdateService extends AbstractUpdateService implements IRelau
+ 	protected buildUpdateFeedUrl(quality: string): string | undefined {
+-		let assetID: string;
+-		if (!this.productService.darwinUniversalAssetId) {
+-			assetID = process.arch === 'x64' ? 'darwin' : 'darwin-arm64';
+-		} else {
+-			assetID = this.productService.darwinUniversalAssetId;
+-		}
+-		const url = createUpdateURL(assetID, quality, this.productService);
++		const url = createUpdateURL(this.productService, quality, process.platform, process.arch);
+ 		try {
+@@ -94,4 +90,29 @@ export class DarwinUpdateService extends AbstractUpdateService implements IRelau
+ 	protected doCheckForUpdates(context: any): void {
++		if (!this.url) {
++			return;
++		}
++
+ 		this.setState(State.CheckingForUpdates(context));
+-		electron.autoUpdater.checkForUpdates();
++
++		this.requestService.request({ url: this.url }, CancellationToken.None)
++			.then<IUpdate | null>(asJson)
++			.then(update => {
++				if (!update || !update.url || !update.version || !update.productVersion) {
++					this.setState(State.Idle(UpdateType.Setup));
++
++					return Promise.resolve(null);
++				}
++
++				const fetchedVersion = update.productVersion.replace(/(\d+\.\d+\.\d+)(?:\.(\d+))(\-\w+)?/, '$1$3+$2');
++				const currentVersion = `${this.productService.version}+${this.productService.release}`;
++
++				if(semver.compareBuild(currentVersion, fetchedVersion) >= 0) {
++					this.setState(State.Idle(UpdateType.Setup));
++				}
++				else {
++					electron.autoUpdater.checkForUpdates();
++				}
++
++				return Promise.resolve(null);
++			})
+ 	}
+diff --git a/src/vs/platform/update/electron-main/updateService.linux.ts b/src/vs/platform/update/electron-main/updateService.linux.ts
+index 6e076c7..81556b6 100644
+--- a/src/vs/platform/update/electron-main/updateService.linux.ts
++++ b/src/vs/platform/update/electron-main/updateService.linux.ts
+@@ -33,3 +33,3 @@ export class LinuxUpdateService extends AbstractUpdateService {
+ 	protected buildUpdateFeedUrl(quality: string): string {
+-		return createUpdateURL(`linux-${process.arch}`, quality, this.productService);
++		return createUpdateURL(this.productService, quality, process.platform, process.arch);
+ 	}
+diff --git a/src/vs/platform/update/electron-main/updateService.win32.ts b/src/vs/platform/update/electron-main/updateService.win32.ts
+index 61109e5..06981b3 100644
+--- a/src/vs/platform/update/electron-main/updateService.win32.ts
++++ b/src/vs/platform/update/electron-main/updateService.win32.ts
+@@ -11,3 +11,2 @@ import { CancellationToken } from '../../../base/common/cancellation.js';
+ import { memoize } from '../../../base/common/decorators.js';
+-import { hash } from '../../../base/common/hash.js';
+ import * as path from '../../../base/common/path.js';
+@@ -25,4 +24,5 @@ import { asJson, IRequestService } from '../../request/common/request.js';
+ import { ITelemetryService } from '../../telemetry/common/telemetry.js';
+-import { AvailableForDownload, DisablementReason, IUpdate, State, StateType, UpdateType } from '../common/update.js';
+-import { AbstractUpdateService, createUpdateURL, UpdateErrorClassification, UpdateNotAvailableClassification } from './abstractUpdateService.js';
++import { AvailableForDownload, DisablementReason, IUpdate, State, StateType, Target, UpdateType } from '../common/update.js';
++import { AbstractUpdateService, createUpdateURL} from './abstractUpdateService.js';
++import * as semver from 'semver';
+ 
+@@ -42,5 +42,9 @@ function getUpdateType(): UpdateType {
+ 	if (typeof _updateType === 'undefined') {
+-		_updateType = fs.existsSync(path.join(path.dirname(process.execPath), 'unins000.exe'))
+-			? UpdateType.Setup
+-			: UpdateType.Archive;
++		if (fs.existsSync(path.join(path.dirname(process.execPath), 'unins000.exe'))) {
++			_updateType = UpdateType.Setup;
++		} else if (path.basename(path.normalize(path.join(process.execPath, '..', '..'))) === 'Program Files') {
++			_updateType = UpdateType.WindowsInstaller;
++		} else {
++			_updateType = UpdateType.Archive;
++		}
+ 	}
+@@ -63,2 +67,3 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
+ 		@IConfigurationService configurationService: IConfigurationService,
++		// @ts-expect-error
+ 		@ITelemetryService private readonly telemetryService: ITelemetryService,
+@@ -102,11 +107,21 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
+ 	protected buildUpdateFeedUrl(quality: string): string | undefined {
+-		let platform = `win32-${process.arch}`;
+-
+-		if (getUpdateType() === UpdateType.Archive) {
+-			platform += '-archive';
+-		} else if (this.productService.target === 'user') {
+-			platform += '-user';
++		let target: Target;
++
++		switch (getUpdateType()) {
++			case UpdateType.Archive:
++				target = "archive"
++				break;
++			case UpdateType.WindowsInstaller:
++				target = "msi"
++				break;
++			default:
++				if (this.productService.target === 'user') {
++					target = "user"
++				}
++				else {
++					target = "system"
++				}
+ 		}
+ 
+-		return createUpdateURL(platform, quality, this.productService);
++		return createUpdateURL(this.productService, quality, process.platform, process.arch, target);
+ 	}
+@@ -126,4 +141,10 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
+ 				if (!update || !update.url || !update.version || !update.productVersion) {
+-					this.telemetryService.publicLog2<{ explicit: boolean }, UpdateNotAvailableClassification>('update:notAvailable', { explicit: !!context });
++					this.setState(State.Idle(updateType));
++					return Promise.resolve(null);
++				}
++
++				const fetchedVersion = update.productVersion.replace(/(\d+\.\d+\.\d+)(?:\.(\d+))(\-\w+)?/, '$1$3+$2');
++				const currentVersion = `${this.productService.version}+${this.productService.release}`;
+ 
++				if(semver.compareBuild(currentVersion, fetchedVersion) >= 0) {
+ 					this.setState(State.Idle(updateType));
+@@ -158,3 +179,3 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
+ 
+-						const fastUpdatesEnabled = this.configurationService.getValue('update.enableWindowsBackgroundUpdates');
++						const fastUpdatesEnabled = getUpdateType() == UpdateType.Setup && this.configurationService.getValue('update.enableWindowsBackgroundUpdates');
+ 						if (fastUpdatesEnabled) {
+@@ -170,3 +191,2 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
+ 			.then(undefined, err => {
+-				this.telemetryService.publicLog2<{ messageHash: string }, UpdateErrorClassification>('update:error', { messageHash: String(hash(String(err))) });
+ 				this.logService.error(err);
+@@ -254,6 +274,14 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
+ 		} else {
+-			spawn(this.availableUpdate.packagePath, ['/silent', '/log', '/mergetasks=runcode,!desktopicon,!quicklaunchicon'], {
+-				detached: true,
+-				stdio: ['ignore', 'ignore', 'ignore']
+-			});
++			const type = getUpdateType();
++			if (type == UpdateType.WindowsInstaller) {
++				spawn('msiexec.exe', ['/i', this.availableUpdate.packagePath], {
++					detached: true,
++					stdio: ['ignore', 'ignore', 'ignore']
++				});
++			} else {
++				spawn(this.availableUpdate.packagePath, ['/silent', '/log', '/mergetasks=runcode,!desktopicon,!quicklaunchicon'], {
++					detached: true,
++					stdio: ['ignore', 'ignore', 'ignore']
++				});
++			}
+ 		}

prepare_assets.sh

@@ -5,18 +5,6 @@ set -e
 
 APP_NAME_LC="$( echo "${APP_NAME}" | awk '{print tolower($0)}' )"
 
-. ./utils.sh
-
-npm install -g checksum
-
-sum_file() {
-  if [[ -f "${1}" ]]; then
-    echo "Calculating checksum for ${1}"
-    checksum -a sha256 "${1}" > "${1}".sha256
-    checksum "${1}" > "${1}".sha1
-  fi
-}
-
 mkdir -p assets
 
 if [[ "${OS_NAME}" == "osx" ]]; then
@@ -219,12 +207,13 @@ if [[ "${SHOULD_BUILD_REH}" != "no" ]]; then
   cd ..
 fi
 
-cd assets
+if [[ "${SHOULD_BUILD_REH_WEB}" != "no" ]]; then
+  echo "Building and moving REH-web"
+  cd "vscode-reh-web-${VSCODE_PLATFORM}-${VSCODE_ARCH}"
+  tar czf "../assets/${APP_NAME_LC}-reh-web-${VSCODE_PLATFORM}-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" .
+  cd ..
+fi
 
-for FILE in *; do
-  if [[ -f "${FILE}" ]]; then
-    sum_file "${FILE}"
-  fi
-done
-
-cd ..
+if [[ "${OS_NAME}" != "windows" ]]; then
+  ./prepare_checksums.sh
+fi

prepare_checksums.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+set -e
+
+npm install -g checksum
+
+sum_file() {
+  if [[ -f "${1}" ]]; then
+    echo "Calculating checksum for ${1}"
+    checksum -a sha256 "${1}" > "${1}".sha256
+    checksum "${1}" > "${1}".sha1
+  fi
+}
+
+cd assets
+
+for FILE in *; do
+  if [[ -f "${FILE}" ]]; then
+    sum_file "${FILE}"
+  fi
+done
+
+cd ..

prepare_vscode.sh

@@ -77,37 +77,23 @@ if [[ "${OS_NAME}" == "linux" ]]; then
    if [[ "${npm_config_arch}" == "arm" ]]; then
     export npm_config_arm_version=7
   fi
-
-  CHILD_CONCURRENCY=1 yarn --frozen-lockfile --check-files --network-timeout 180000
-elif [[ "${OS_NAME}" == "osx" ]]; then
-  CHILD_CONCURRENCY=1 yarn --frozen-lockfile --network-timeout 180000
-
-  yarn postinstall
-else
-  # TODO: Should be replaced with upstream URL once https://github.com/nodejs/node-gyp/pull/2825
-  # gets merged.
-  rm -rf .build/node-gyp
-  mkdir -p .build/node-gyp
-  cd .build/node-gyp
-
-  git config --global user.email "$( echo "${GITHUB_USERNAME}" | awk '{print tolower($0)}' )-ci@not-real.com"
-  git config --global user.name "${GITHUB_USERNAME} CI"
-  git clone https://github.com/nodejs/node-gyp.git .
-  git checkout v10.0.1
-  npm install
-
-  npm_config_node_gyp="$( pwd )/bin/node-gyp.js"
-  export npm_config_node_gyp
-
-  cd ../..
-
+elif [[ "${OS_NAME}" == "windows" ]]; then
   if [[ "${npm_config_arch}" == "arm" ]]; then
     export npm_config_arm_version=7
   fi
-
-  CHILD_CONCURRENCY=1 yarn --frozen-lockfile --check-files --network-timeout 180000
 fi
 
+for i in {1..5}; do # try 5 times
+  npm ci && break
+  if [[ $i == 3 ]]; then
+    echo "Npm install failed too many times" >&2
+    exit 1
+  fi
+  echo "Npm install failed $i, trying again..."
+
+  sleep $(( 15 * (i + 1)))
+done
+
 setpath() {
   local jsonTmp
   { set +x; } 2>/dev/null
@@ -143,7 +129,7 @@ setpath "product" "tipsAndTricksUrl" "https://go.microsoft.com/fwlink/?linkid=85
 setpath "product" "twitterUrl" "https://go.microsoft.com/fwlink/?LinkID=533687"
 
 if [[ "${DISABLE_UPDATE}" != "yes" ]]; then
-  setpath "product" "updateUrl" "https://vscodium.now.sh"
+  setpath "product" "updateUrl" "https://raw.githubusercontent.com/VSCodium/versions/refs/heads/master"
   setpath "product" "downloadUrl" "https://github.com/VSCodium/vscodium/releases"
 fi
 
@@ -237,16 +223,16 @@ if [[ "${OS_NAME}" == "linux" ]]; then
 
   # control.template
   sed -i 's|Microsoft Corporation <vscode-linux@microsoft.com>|VSCodium Team https://github.com/VSCodium/vscodium/graphs/contributors|'  resources/linux/debian/control.template
-  sed -i 's|https://code.visualstudio.com|https://vscodium.com|' resources/linux/debian/control.template
   sed -i 's|Visual Studio Code|VSCodium|g' resources/linux/debian/control.template
   sed -i 's|https://code.visualstudio.com/docs/setup/linux|https://github.com/VSCodium/vscodium#download-install|' resources/linux/debian/control.template
+  sed -i 's|https://code.visualstudio.com|https://vscodium.com|' resources/linux/debian/control.template
 
   # code.spec.template
-  sed -i 's|https://code.visualstudio.com/docs/setup/linux|https://github.com/VSCodium/vscodium#download-install|' resources/linux/rpm/code.spec.template
   sed -i 's|Microsoft Corporation|VSCodium Team|' resources/linux/rpm/code.spec.template
   sed -i 's|Visual Studio Code Team <vscode-linux@microsoft.com>|VSCodium Team https://github.com/VSCodium/vscodium/graphs/contributors|' resources/linux/rpm/code.spec.template
-  sed -i 's|https://code.visualstudio.com|https://vscodium.com|' resources/linux/rpm/code.spec.template
   sed -i 's|Visual Studio Code|VSCodium|' resources/linux/rpm/code.spec.template
+  sed -i 's|https://code.visualstudio.com/docs/setup/linux|https://github.com/VSCodium/vscodium#download-install|' resources/linux/rpm/code.spec.template
+  sed -i 's|https://code.visualstudio.com|https://vscodium.com|' resources/linux/rpm/code.spec.template
 
   # snapcraft.yaml
   sed -i 's|Visual Studio Code|VSCodium|'  resources/linux/rpm/code.spec.template

product.json

@@ -49,6 +49,7 @@
   "extensionEnabledApiProposals": {
     "ms-vscode.vscode-selfhost-test-provider": [
       "testObserver",
+      "testRelatedCode",
       "attributableCoverage"
     ],
     "VisualStudioExptTeam.vscodeintellicode-completions": [
@@ -78,6 +79,7 @@
       "resolvers"
     ],
     "ms-python.python": [
+      "codeActionAI",
       "contribEditorContentMenu",
       "quickPickSortByLabel",
       "portsAttributes",
@@ -86,7 +88,8 @@
       "terminalDataWriteEvent",
       "terminalExecuteCommandEvent",
       "contribIssueReporter",
-      "terminalShellIntegration"
+      "notebookReplDocument",
+      "notebookVariableProvider"
     ],
     "ms-dotnettools.dotnet-interactive-vscode": [
       "notebookMessaging"
@@ -180,6 +183,7 @@
       "codeActionRanges",
       "commentingRangeHint",
       "commentReactor",
+      "commentReveal",
       "commentThreadApplicability",
       "contribAccessibilityHelpContent",
       "contribCommentEditorActionsMenu",
@@ -212,6 +216,7 @@
       "chatParticipantAdditions",
       "defaultChatParticipant",
       "embeddings",
+      "chatEditing",
       "chatVariableResolver",
       "chatProvider",
       "mappedEditsProvider",
@@ -219,6 +224,9 @@
       "codeActionAI",
       "findTextInFiles",
       "textSearchProvider",
+      "textSearchProvider2",
+      "activeComment",
+      "commentReveal",
       "contribSourceControlInputBoxMenu",
       "contribCommentEditorActionsMenu",
       "contribCommentThreadAdditionalMenu",
@@ -230,7 +238,9 @@
       "testObserver",
       "aiTextSearchProvider",
       "documentFiltersExclusive",
-      "chatParticipantPrivate"
+      "chatParticipantPrivate",
+      "contribDebugCreateConfiguration",
+      "inlineEdit"
     ],
     "GitHub.remotehub": [
       "contribRemoteHelp",
@@ -254,9 +264,10 @@
       "notebookCellExecutionState"
     ],
     "ms-python.debugpy": [
-      "portsAttributes",
       "contribIssueReporter",
-      "debugVisualization"
+      "contribViewsWelcome",
+      "debugVisualization",
+      "portsAttributes"
     ],
     "ms-toolsai.jupyter-renderers": [
       "contribNotebookStaticPreloads"
@@ -275,7 +286,8 @@
       "quickPickItemTooltip",
       "notebookExecution",
       "notebookCellExecution",
-      "notebookVariableProvider"
+      "notebookVariableProvider",
+      "notebookReplDocument"
     ],
     "dbaeumer.vscode-eslint": [
       "notebookCellExecutionState"
@@ -286,14 +298,6 @@
     "ms-azuretools.vscode-azureappservice": [
       "terminalDataWriteEvent"
     ],
-    "ms-azuretools.vscode-azureresourcegroups": [
-      "authGetSessions"
-    ],
-    "ms-azuretools.vscode-azure-github-copilot": [
-      "chatParticipantAdditions",
-      "embeddings",
-      "languageModelSystem"
-    ],
     "ms-vscode.anycode": [
       "extensionsAny"
     ],
@@ -303,6 +307,7 @@
     "redhat.java": [
       "documentPaste"
     ],
+    "vscjava.vscode-java-pack": [],
     "ms-dotnettools.csdevkit": [
       "inlineCompletionsAdditions"
     ],
@@ -321,6 +326,17 @@
       "chatParticipantAdditions",
       "languageModelSystem"
     ],
+    "ms-toolsai.datawrangler": [],
+    "ms-vscode.vscode-commander": [],
+    "ms-vscode.vscode-websearchforcopilot": [],
+    "ms-vscode.vscode-copilot-data-analysis": [
+      "chatVariableResolver",
+      "chatProvider"
+    ],
+    "ms-vscode.vscode-copilot-vision": [
+      "chatReferenceBinaryData",
+      "codeActionAI"
+    ],
     "jeanp413.open-remote-ssh": [
       "resolvers",
       "tunnels",

release.sh

@@ -1,8 +1,9 @@
 #!/usr/bin/env bash
+# shellcheck disable=SC1091
 
-set -e
+set -ex
 
-if [[ -z "${GITHUB_TOKEN}" ]]; then
+if [[ -z "${GH_TOKEN}" ]] && [[ -z "${GITHUB_TOKEN}" ]] && [[ -z "${GH_ENTERPRISE_TOKEN}" ]] && [[ -z "${GITHUB_ENTERPRISE_TOKEN}" ]]; then
   echo "Will not release because no GITHUB_TOKEN defined"
   exit
 fi
@@ -17,13 +18,22 @@ if [[ $( gh release view --repo "${ASSETS_REPOSITORY}" "${RELEASE_VERSION}" 2>&1
 
   if [[ "${VSCODE_QUALITY}" == "insider" ]]; then
     NOTES="update vscode to [${MS_COMMIT}](https://github.com/microsoft/vscode/tree/${MS_COMMIT})"
-    CREATE_OPTIONS=""
-  else
-    NOTES="update vscode to [${MS_TAG}](https://code.visualstudio.com/updates/v$( echo "${MS_TAG//./_}" | cut -d'_' -f 1,2 ))"
-    CREATE_OPTIONS="--generate-notes"
-  fi
 
-  gh release create "${RELEASE_VERSION}" --repo "${ASSETS_REPOSITORY}" --title "${RELEASE_VERSION}" --notes "${NOTES}" ${CREATE_OPTIONS}
+    gh release create "${RELEASE_VERSION}" --repo "${ASSETS_REPOSITORY}" --title "${RELEASE_VERSION}" --notes "${NOTES}"
+  else
+    gh release create "${RELEASE_VERSION}" --repo "${ASSETS_REPOSITORY}" --title "${RELEASE_VERSION}" --generate-notes
+
+    . ./utils.sh
+
+    RELEASE_NOTES=$( gh release view "${RELEASE_VERSION}" --json "body" --jq ".body" )
+
+    replace "s|MS_TAG_SHORT|$( echo "${MS_TAG//./_}" | cut -d'_' -f 1,2 )|" release_notes.txt
+    replace "s|MS_TAG|${MS_TAG}|" release_notes.txt
+    replace "s|RELEASE_VERSION|${RELEASE_VERSION}|g" release_notes.txt
+    replace "s|RELEASE_NOTES|${RELEASE_NOTES//$'\n'/\\n}|" release_notes.txt
+
+    gh release edit "${RELEASE_VERSION}" --notes-file release_notes.txt
+  fi
 fi
 
 cd assets

release_notes.txt

@@ -0,0 +1,258 @@
+update vscode to [MS_TAG](https://code.visualstudio.com/updates/vMS_TAG_SHORT)
+
+RELEASE_NOTES
+
+## x86 64bits
+
+<table>
+  <tr>
+    <td rowspan="7">Windows</td>
+    <td>User Installer</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/VSCodiumUserSetup-x64-RELEASE_VERSION.exe">VSCodiumUserSetup-x64-RELEASE_VERSION.exe</a></td>
+  </tr>
+  <tr>
+    <td>System Installer</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/VSCodiumSetup-x64-RELEASE_VERSION.exe">VSCodiumSetup-x64-RELEASE_VERSION.exe</a></td>
+  </tr>
+  <tr>
+    <td>.zip</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/VSCodium-win32-x64-RELEASE_VERSION.zip">VSCodium-win32-x64-RELEASE_VERSION.zip</a></td>
+  </tr>
+  <tr>
+    <td>.msi - updates enabled</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/VSCodium-x64-RELEASE_VERSION.msi">VSCodium-x64-RELEASE_VERSION.msi</a></td>
+  </tr>
+  <tr>
+    <td>.msi - updates disabled</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/VSCodium-x64-updates-disabled-RELEASE_VERSION.msi">VSCodium-x64-updates-disabled-RELEASE_VERSION.msi</a></td>
+  </tr>
+  <tr>
+    <td>Remote Host</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/vscodium-reh-win32-x64-RELEASE_VERSION.tar.gz">vscodium-reh-win32-x64-RELEASE_VERSION.tar.gz</a></td>
+  </tr>
+  <tr>
+    <td>Web Host</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/vscodium-reh-web-win32-x64-RELEASE_VERSION.tar.gz">vscodium-reh-web-win32-x64-RELEASE_VERSION.tar.gz</a></td>
+  </tr>
+  <tr>
+    <td rowspan="4">macOS</td>
+    <td>.dmg</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/VSCodium.x64.RELEASE_VERSION.dmg">VSCodium.x64.RELEASE_VERSION.dmg</a></td>
+  </tr>
+  <tr>
+    <td>.zip</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/VSCodium-darwin-x64-RELEASE_VERSION.zip">VSCodium-darwin-x64-RELEASE_VERSION.zip</a></td>
+  </tr>
+  <tr>
+    <td>Remote Host</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/vscodium-reh-darwin-x64-RELEASE_VERSION.tar.gz">vscodium-reh-darwin-x64-RELEASE_VERSION.tar.gz</a></td>
+  </tr>
+  <tr>
+    <td>Web Host</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/vscodium-reh-web-darwin-x64-RELEASE_VERSION.tar.gz">vscodium-reh-web-darwin-x64-RELEASE_VERSION.tar.gz</a></td>
+  </tr>
+  <tr>
+  <td rowspan="7">Linux</td>
+    <td>.deb</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/codium_RELEASE_VERSION_amd64.deb">codium_RELEASE_VERSION_amd64.deb</a></td>
+  </tr>
+  <tr>
+    <td>.rpm</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/codium-RELEASE_VERSION-el9.x86_64.rpm">codium-RELEASE_VERSION-el9.x86_64.rpm</a></td>
+  </tr>
+  <tr>
+    <td>.tar.gz</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/VSCodium-linux-x64-RELEASE_VERSION.tar.gz">VSCodium-linux-x64-RELEASE_VERSION.tar.gz</a></td>
+  </tr>
+  <tr>
+    <td>AppImage</td>
+    <td>
+      <a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/VSCodium-RELEASE_VERSION.glibc2.25-x86_64.AppImage">VSCodium-RELEASE_VERSION.glibc2.25-x86_64.AppImage</a><br />
+      <a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/VSCodium-RELEASE_VERSION.glibc2.25-x86_64.AppImage.zsync">VSCodium-RELEASE_VERSION.glibc2.25-x86_64.AppImage.zsync</a>
+    </td>
+  </tr>
+  <tr>
+    <td>Snap</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/codium_RELEASE_VERSION_amd64.snap">codium_RELEASE_VERSION_amd64.snap</a></td>
+  </tr>
+  <tr>
+    <td>Remote Host</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/vscodium-reh-linux-x64-RELEASE_VERSION.tar.gz">vscodium-reh-linux-x64-RELEASE_VERSION.tar.gz</a></td>
+  </tr>
+  <tr>
+    <td>Web Host</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/vscodium-reh-web-linux-x64-RELEASE_VERSION.tar.gz">vscodium-reh-web-linux-x64-RELEASE_VERSION.tar.gz</a></td>
+  </tr>
+  <tr>
+    <td rowspan="2">Alpine</td>
+    <td>Remote Host</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/vscodium-reh-alpine-x64-RELEASE_VERSION.tar.gz">vscodium-reh-alpine-x64-RELEASE_VERSION.tar.gz</a></td>
+  </tr>
+  <tr>
+    <td>Web Host</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/vscodium-reh-web-alpine-x64-RELEASE_VERSION.tar.gz">vscodium-reh-web-alpine-x64-RELEASE_VERSION.tar.gz</a></td>
+  </tr>
+</table>
+
+## ARM 64bits
+
+<table>
+  <tr>
+    <td rowspan="3">Windows</td>
+    <td>User Installer</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/VSCodiumUserSetup-arm64-RELEASE_VERSION.exe">VSCodiumUserSetup-arm64-RELEASE_VERSION.exe</a></td>
+  </tr>
+  <tr>
+    <td>System Installer</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/VSCodiumSetup-arm64-RELEASE_VERSION.exe">VSCodiumSetup-arm64-RELEASE_VERSION.exe</a></td>
+  </tr>
+  <tr>
+    <td>.zip</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/VSCodium-win32-arm64-RELEASE_VERSION.zip">VSCodium-win32-arm64-RELEASE_VERSION.zip</a></td>
+  </tr>
+  <tr>
+    <td rowspan="4">macOS</td>
+    <td>.dmg</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/VSCodium.arm64.RELEASE_VERSION.dmg">VSCodium.arm64.RELEASE_VERSION.dmg</a></td>
+  </tr>
+  <tr>
+    <td>.zip</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/VSCodium-darwin-arm64-RELEASE_VERSION.zip">VSCodium-darwin-arm64-RELEASE_VERSION.zip</a></td>
+  </tr>
+  <tr>
+    <td>Remote Host</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/vscodium-reh-darwin-arm64-RELEASE_VERSION.tar.gz">vscodium-reh-darwin-arm64-RELEASE_VERSION.tar.gz</a></td>
+  </tr>
+  <tr>
+    <td>Web Host</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/vscodium-reh-web-darwin-arm64-RELEASE_VERSION.tar.gz">vscodium-reh-web-darwin-arm64-RELEASE_VERSION.tar.gz</a></td>
+  </tr>
+  <tr>
+    <td rowspan="6">Linux</td>
+    <td>.deb</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/codium_RELEASE_VERSION_arm64.deb">codium_RELEASE_VERSION_arm64.deb</a></td>
+  </tr>
+  <tr>
+    <td>.rpm</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/codium-RELEASE_VERSION-el9.aarch64.rpm">codium-RELEASE_VERSION-el9.aarch64.rpm</a></td>
+  </tr>
+  <tr>
+    <td>.tar.gz</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/VSCodium-linux-arm64-RELEASE_VERSION.tar.gz">VSCodium-linux-arm64-RELEASE_VERSION.tar.gz</a></td>
+  </tr>
+  <tr>
+    <td>Snap</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/codium_RELEASE_VERSION_arm64.snap">codium_RELEASE_VERSION_arm64.snap</a></td>
+  </tr>
+  <tr>
+    <td>Remote Host</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/vscodium-reh-linux-arm64-RELEASE_VERSION.tar.gz">vscodium-reh-linux-arm64-RELEASE_VERSION.tar.gz</a></td>
+  </tr>
+  <tr>
+    <td>Web Host</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/vscodium-reh-web-linux-arm64-RELEASE_VERSION.tar.gz">vscodium-reh-web-linux-arm64-RELEASE_VERSION.tar.gz</a></td>
+  </tr>
+  <tr>
+    <td rowspan="2">Alpine</td>
+    <td>Remote Host</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/vscodium-reh-alpine-arm64-RELEASE_VERSION.tar.gz">vscodium-reh-alpine-arm64-RELEASE_VERSION.tar.gz</a></td>
+  </tr>
+  <tr>
+    <td>Web Host</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/vscodium-reh-web-alpine-arm64-RELEASE_VERSION.tar.gz">vscodium-reh-web-alpine-arm64-RELEASE_VERSION.tar.gz</a></td>
+  </tr>
+</table>
+
+## ARM 32bits
+
+<table>
+  <tr>
+    <td rowspan="5">Linux</td>
+    <td>.deb</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/codium_RELEASE_VERSION_armhf.deb">codium_RELEASE_VERSION_armhf.deb</a></td>
+  </tr>
+  <tr>
+    <td>.rpm</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/codium-RELEASE_VERSION-el9.armv7hl.rpm">codium-RELEASE_VERSION-el9.armv7hl.rpm</a></td>
+  </tr>
+  <tr>
+    <td>.tar.gz</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/VSCodium-linux-armhf-RELEASE_VERSION.tar.gz">VSCodium-linux-armhf-RELEASE_VERSION.tar.gz</a></td>
+  </tr>
+  <tr>
+    <td>Remote Host</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/vscodium-reh-linux-armhf-RELEASE_VERSION.tar.gz">vscodium-reh-linux-armhf-RELEASE_VERSION.tar.gz</a></td>
+  </tr>
+  <tr>
+    <td>Web Host</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/vscodium-reh-web-linux-armhf-RELEASE_VERSION.tar.gz">vscodium-reh-web-linux-armhf-RELEASE_VERSION.tar.gz</a></td>
+  </tr>
+</table>
+
+## PPC 64bits
+
+<table>
+  <tr>
+    <td rowspan="3">Linux</td>
+    <td>.tar.gz</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/VSCodium-linux-ppc64le-RELEASE_VERSION.tar.gz">VSCodium-linux-ppc64le-RELEASE_VERSION.tar.gz</a></td>
+  </tr>
+  <tr>
+    <td>Remote Host</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/vscodium-reh-linux-ppc64le-RELEASE_VERSION.tar.gz">vscodium-reh-linux-ppc64le-RELEASE_VERSION.tar.gz</a></td>
+  </tr>
+  <tr>
+    <td>Web Host</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/vscodium-reh-web-linux-ppc64le-RELEASE_VERSION.tar.gz">vscodium-reh-web-linux-ppc64le-RELEASE_VERSION.tar.gz</a></td>
+  </tr>
+</table>
+
+## RISC-V 64bits
+
+<table>
+  <tr>
+    <td rowspan="3">Linux</td>
+    <td>.tar.gz</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/VSCodium-linux-riscv64-RELEASE_VERSION.tar.gz">VSCodium-linux-riscv64-RELEASE_VERSION.tar.gz</a></td>
+  </tr>
+  <tr>
+    <td>Remote Host</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/vscodium-reh-linux-riscv64-RELEASE_VERSION.tar.gz">vscodium-reh-linux-riscv64-RELEASE_VERSION.tar.gz</a></td>
+  </tr>
+  <tr>
+    <td>Web Host</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/vscodium-reh-web-linux-riscv64-RELEASE_VERSION.tar.gz">vscodium-reh-web-linux-riscv64-RELEASE_VERSION.tar.gz</a></td>
+  </tr>
+</table>
+
+## Loong 64bits
+
+<table>
+  <tr>
+    <td rowspan="3">Linux</td>
+    <td>.tar.gz</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/VSCodium-linux-loong64-RELEASE_VERSION.tar.gz">VSCodium-linux-loong64-RELEASE_VERSION.tar.gz</a></td>
+  </tr>
+  <tr>
+    <td>Remote Host</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/vscodium-reh-linux-loong64-RELEASE_VERSION.tar.gz">vscodium-reh-linux-loong64-RELEASE_VERSION.tar.gz</a></td>
+  </tr>
+  <tr>
+    <td>Web Host</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/vscodium-reh-web-linux-loong64-RELEASE_VERSION.tar.gz">vscodium-reh-web-linux-loong64-RELEASE_VERSION.tar.gz</a></td>
+  </tr>
+</table>
+
+## s390x
+
+<table>
+  <tr>
+    <td rowspan="2">Linux</td>
+    <td>Remote Host</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/vscodium-reh-linux-s390x-RELEASE_VERSION.tar.gz">vscodium-reh-linux-s390x-RELEASE_VERSION.tar.gz</a></td>
+  </tr>
+  <tr>
+    <td>Web Host</td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/vscodium-reh-web-linux-s390x-RELEASE_VERSION.tar.gz">vscodium-reh-web-linux-s390x-RELEASE_VERSION.tar.gz</a></td>
+  </tr>
+</table>

ripgrep_linux_loong64.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+# When installing @vscode/ripgrep, it will try to download prebuilt ripgrep binary from https://github.com/microsoft/ripgrep-prebuilt,
+# however, loong64 is not a supported architecture and x86 will be picked as fallback, so we need to replace it with a native one.
+
+if [ "$#" -ne 1 ]; then
+    echo "Usage: $0 <path_to_node_modules>"
+    exit 1
+fi
+
+RG_PATH="$1/@vscode/ripgrep/bin/rg"
+RG_VERSION="14.1.1"
+
+echo "Replacing ripgrep binary with loong64 one"
+
+rm "${RG_PATH}"
+curl --silent --fail -L https://github.com/darkyzhou/ripgrep-loongarch64-musl/releases/download/${RG_VERSION}/rg -o "${RG_PATH}"
+chmod +x "${RG_PATH}"

ripgrep_linux_riscv64.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+# microsoft/ripgrep-prebuilt doesn't support riscv64.
+# Tracking PR: https://github.com/microsoft/ripgrep-prebuilt/pull/41
+
+if [ "$#" -ne 1 ]; then
+    echo "Usage: $0 <path_to_node_modules>"
+    exit 1
+fi
+
+RG_PATH="$1/@vscode/ripgrep/bin/rg"
+RG_VERSION="14.1.1-3"
+
+echo "Replacing ripgrep binary with riscv64 one"
+
+rm "${RG_PATH}"
+curl --silent --fail -L https://github.com/riscv-forks/ripgrep-riscv64-prebuilt/releases/download/${RG_VERSION}/rg -o "${RG_PATH}"
+chmod +x "${RG_PATH}"

stable.json

@@ -1,4 +1,4 @@
 {
-  "tag": "1.90.0",
-  "commit": "89de5a8d4d6205e5b11647eb6a74844ca23d2573"
+  "tag": "1.96.4",
+  "commit": "cd4ee3b1c348a13bafd8f9ad8060705f6d4b9cba"
 }

stores/snapcraft/check_version.sh

@@ -7,10 +7,13 @@ export SHOULD_BUILD="no"
 export SHOULD_DEPLOY_TO_RELEASE="no"
 export SHOULD_DEPLOY_TO_STORE="no"
 
+# Support for GitHub Enterprise
+GH_HOST="${GH_HOST:-github.com}"
+
 if [[ "${GENERATE_ASSETS}" == "true" ]]; then
   export SHOULD_BUILD="yes"
 else
-  wget --quiet "https://api.github.com/repos/${ASSETS_REPOSITORY}/releases" -O gh_latest.json
+  wget --quiet "https://api.${GH_HOST}/repos/${ASSETS_REPOSITORY}/releases" -O gh_latest.json
   SNAP_URL=$( jq -r 'map(select(.tag_name == "'"${RELEASE_VERSION}"'"))|first.assets[].browser_download_url|select(endswith("'"_${ARCHITECTURE}.snap"'"))' gh_latest.json )
 
   if [[ -z "${SNAP_URL}" ]]; then
@@ -19,11 +22,13 @@ else
   fi
 
   if [[ "${VSCODE_QUALITY}" == "stable" ]]; then
+    CHANNEL="${SNAPCRAFT_STORE_CHANNEL:-stable}"
+
     sudo snap install --channel stable --classic snapcraft
 
     echo "Architecture: ${ARCHITECTURE}"
 
-    SNAP_VERSION=$( snapcraft list-revisions "${SNAP_NAME}" | grep -F "stable*" | grep "${ARCHITECTURE}" | tr -s ' ' | cut -d ' ' -f 4 )
+    SNAP_VERSION=$( snapcraft list-revisions "${SNAP_NAME}" | grep -F "${CHANNEL}*" | grep "${ARCHITECTURE}" | tr -s ' ' | cut -d ' ' -f 4 )
     echo "Snap version: ${SNAP_VERSION}"
 
     if [[ -n "${SNAP_VERSION}" && "${SNAP_VERSION}" != "${RELEASE_VERSION}" ]]; then

update_qualityjson.sh

@@ -7,7 +7,7 @@ if [[ "${SHOULD_BUILD}" != "yes" ]]; then
   exit 0
 fi
 
-if [[ -z "${GITHUB_TOKEN}" ]]; then
+if [[ -z "${GH_TOKEN}" ]] && [[ -z "${GITHUB_TOKEN}" ]] && [[ -z "${GH_ENTERPRISE_TOKEN}" ]] && [[ -z "${GITHUB_ENTERPRISE_TOKEN}" ]]; then
   echo "Will not update ${VSCODE_QUALITY}.json because no GITHUB_TOKEN defined"
   exit 0
 fi

update_version.sh

@@ -8,11 +8,16 @@ if [[ "${SHOULD_BUILD}" != "yes" && "${FORCE_UPDATE}" != "true" ]]; then
   exit 0
 fi
 
-if [[ -z "${GITHUB_TOKEN}" ]]; then
+if [[ -z "${GH_TOKEN}" ]] && [[ -z "${GITHUB_TOKEN}" ]] && [[ -z "${GH_ENTERPRISE_TOKEN}" ]] && [[ -z "${GITHUB_ENTERPRISE_TOKEN}" ]]; then
   echo "Will not update version JSON because no GITHUB_TOKEN defined"
   exit 0
+else
+  GITHUB_TOKEN="${GH_TOKEN:-${GITHUB_TOKEN:-${GH_ENTERPRISE_TOKEN:-${GITHUB_ENTERPRISE_TOKEN}}}}"
 fi
 
+# Support for GitHub Enterprise
+GH_HOST="${GH_HOST:-github.com}"
+
 if [[ "${FORCE_UPDATE}" == "true" ]]; then
   . version.sh
 fi
@@ -23,7 +28,7 @@ if [[ -z "${BUILD_SOURCEVERSION}" ]]; then
 fi
 
 if [[ "${VSCODE_ARCH}" == "ppc64le" ]] || [[ "${VSCODE_ARCH}" == "riscv64" ]] ; then
-  echo "Skip ppc64le since only reh is published"
+  echo "Skip PPC64LE since only reh is published"
   exit 0
 fi
 
@@ -47,7 +52,7 @@ fi
 # `sha256hash` in <filename>.sha256
 
 REPOSITORY_NAME="${VERSIONS_REPOSITORY/*\//}"
-URL_BASE="https://github.com/${ASSETS_REPOSITORY}/releases/download/${RELEASE_VERSION}"
+URL_BASE="https://${GH_HOST}/${ASSETS_REPOSITORY}/releases/download/${RELEASE_VERSION}"
 
 generateJson() {
   local url name version productVersion sha1hash sha256hash timestamp
@@ -115,12 +120,12 @@ updateLatestVersion() {
 
 # init versions repo for later commiting + pushing the json file to it
 # thank you https://www.vinaygopinath.me/blog/tech/commit-to-master-branch-on-github-using-travis-ci/
-git clone "https://github.com/${VERSIONS_REPOSITORY}.git"
+git clone "https://${GH_HOST}/${VERSIONS_REPOSITORY}.git"
 cd "${REPOSITORY_NAME}" || { echo "'${REPOSITORY_NAME}' dir not found"; exit 1; }
 git config user.email "$( echo "${GITHUB_USERNAME}" | awk '{print tolower($0)}' )-ci@not-real.com"
 git config user.name "${GITHUB_USERNAME} CI"
 git remote rm origin
-git remote add origin "https://${GITHUB_USERNAME}:${GITHUB_TOKEN}@github.com/${VERSIONS_REPOSITORY}.git" &> /dev/null
+git remote add origin "https://${GITHUB_USERNAME}:${GITHUB_TOKEN}@${GH_HOST}/${VERSIONS_REPOSITORY}.git" &> /dev/null
 cd ..
 
 if [[ "${OS_NAME}" == "osx" ]]; then