fix: use electron v34.3.2 (#2273)

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

.github/ISSUE_TEMPLATE/bug_report.md

@@ -14,7 +14,7 @@ A clear and concise description of what the bug is.
 - [ ] This bug doesn't happen if I use Microsoft's Visual Studio Code. It only happens in VSCodium.
 
 **Please confirm that the issue/resolution isn't already documented**
-- [ ] I checked [the Docs page](https://github.com/VSCodium/vscodium/blob/master/DOCS.md) and my issue is not mentioned there.
+- [ ] I checked [the Docs page](https://github.com/VSCodium/vscodium/blob/master/docs/index.md) and [the Troubleshooting page](https://github.com/VSCodium/vscodium/blob/master/docs/troubleshooting.md) and my issue is not mentioned there.
 
 **To Reproduce**
 Steps to reproduce the behavior:

.github/workflows/insider-linux.yml

@@ -3,30 +3,36 @@ name: insider-linux
 on:
   workflow_dispatch:
     inputs:
-      release_version:
+      force_version:
+        type: boolean
+        description: Force update version
+      generate_assets:
+        type: boolean
+        description: Generate assets
+      checkout_pr:
         type: string
-        description: Forced release version
-      new_release:
-        type: boolean
-        description: Force new Release
-      test_asset_builder:
-        type: boolean
-        description: Test the assets builder
-  schedule:
-    - cron: '0 8 * * *'
+        description: Checkout PR
+  repository_dispatch:
+    types: [insider]
   push:
     branches: [ insider ]
     paths-ignore:
     - '**/*.md'
+    - 'upstream/*.json'
   pull_request:
     branches: [ insider ]
     paths-ignore:
     - '**/*.md'
 
 env:
+  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
   APP_NAME: VSCodium
   ASSETS_REPOSITORY: ${{ github.repository }}-insiders
-  GITHUB_BRANCH: insider
+  BINARY_NAME: codium-insiders
+  DISABLE_UPDATE: 'yes'
+  GH_REPO_PATH: ${{ github.repository_owner }}/${{ github.repository }}
+  GITHUB_BRANCH: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || 'insider' }}
+  ORG_NAME: ${{ github.repository_owner }}
   OS_NAME: linux
   VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
   VSCODE_QUALITY: insider
@@ -34,8 +40,6 @@ env:
 jobs:
   check:
     runs-on: ubuntu-latest
-    container:
-      image: vscodium/vscodium-linux-build-agent:bionic-x64
     outputs:
       MS_COMMIT: ${{ env.MS_COMMIT }}
       MS_TAG: ${{ env.MS_TAG }}
@@ -44,150 +48,429 @@ jobs:
       SHOULD_DEPLOY: ${{ env.SHOULD_DEPLOY }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ env.GITHUB_BRANCH }}
 
-      - name: Clone VSCode repo
+      - name: Switch to relevant branch
         env:
-          RELEASE_VERSION: ${{ github.event.inputs.release_version }}
+          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
         env:
-          TEST_ASSET_BUILDER: ${{ github.event.inputs.test_asset_builder }}
+          GENERATE_ASSETS: ${{ github.event.inputs.generate_assets }}
         run: ./check_cron_or_pr.sh
 
-  dependencies:
-    needs:
-      - check
-    runs-on: ubuntu-latest
-    env:
-      MS_COMMIT: ${{ needs.check.outputs.MS_COMMIT }}
-      MS_TAG: ${{ needs.check.outputs.MS_TAG }}
-      RELEASE_VERSION: ${{ needs.check.outputs.RELEASE_VERSION }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-        - vscode_arch: x64
-          image: vscodium/vscodium-linux-build-agent:centos7-devtoolset8-x64
-        # - vscode_arch: arm64
-        #   image: vscodium/vscodium-linux-build-agent:centos7-devtoolset8-arm64
-    container:
-      image: ${{ matrix.image }}
-    if: needs.check.outputs.SHOULD_BUILD == 'yes' || needs.check.outputs.SHOULD_DEPLOY == 'yes'
-
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          ref: ${{ env.GITHUB_BRANCH }}
-
-      - name: Clone VSCode repo
-        run: ./get_repo.sh
-
-      - uses: docker/setup-qemu-action@v2
-        if: matrix.vscode_arch == 'arm64' || matrix.vscode_arch == 'ppc64le'
-
-      - name: Install remote dependencies
-        run: ./install_remote_dependencies.sh
-
-      - name: Save remote dependencies
-        uses: actions/upload-artifact@v3
-        with:
-          name: remote-dependencies-${{ matrix.vscode_arch }}
-          path: ./remote-dependencies.tar
-          retention-days: ${{ needs.check.outputs.SHOULD_DEPLOY == 'yes' && 30 || 1 }}
-
-  build:
-    needs:
-      - check
-      - dependencies
-    runs-on: ubuntu-latest
-    env:
-      DISABLE_UPDATE: 'yes'
-      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 }}
-      SHOULD_DEPLOY: ${{ needs.check.outputs.SHOULD_DEPLOY }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-        - vscode_arch: x64
-          npm_arch: x64
-          image: vscodium/vscodium-linux-build-agent:bionic-x64
-        - vscode_arch: arm64
-          npm_arch: arm64
-          image: vscodium/vscodium-linux-build-agent:bionic-arm64
-        - vscode_arch: armhf
-          npm_arch: arm
-          image: vscodium/vscodium-linux-build-agent:bionic-armhf
-        - vscode_arch: ppc64le
-          npm_arch: ppc64
-          image: vscodium/vscodium-linux-build-agent:bionic-ppc64le
-    container:
-      image: ${{ matrix.image }}
-      env:
-        VSCODE_ARCH: ${{ matrix.vscode_arch }}
-    outputs:
-      RELEASE_VERSION: ${{ env.RELEASE_VERSION }}
-      SHOULD_BUILD: ${{ env.SHOULD_BUILD }}
-      SHOULD_DEPLOY: ${{ env.SHOULD_DEPLOY }}
-    if: needs.check.outputs.SHOULD_BUILD == 'yes' || needs.check.outputs.SHOULD_DEPLOY == 'yes'
-
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          ref: ${{ env.GITHUB_BRANCH }}
-
-      - name: Clone VSCode repo
-        run: ./get_repo.sh
-
-      - name: Install GH
-        run: ./install_gh.sh
-
       - name: Check existing VSCodium tags/releases
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NEW_RELEASE: ${{ github.event.inputs.new_release }}
+          CHECK_ALL: 'yes'
         run: ./check_tags.sh
-        if: env.SHOULD_DEPLOY == 'yes'
 
-      - name: Restore remote dependencies
-        uses: actions/download-artifact@v3
+  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:
-          name: remote-dependencies-${{ matrix.vscode_arch }}
-        if: env.SHOULD_BUILD == 'yes' && matrix.vscode_arch == 'x64'
+          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.2'
+        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: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - slug: X64
+          vscode_arch: x64
+          npm_arch: x64
+          image: vscodium/vscodium-linux-build-agent:focal-x64
+        - slug: ARM64
+          vscode_arch: arm64
+          npm_arch: arm64
+          image: vscodium/vscodium-linux-build-agent:focal-arm64
+        - slug: ARM32
+          vscode_arch: armhf
+          npm_arch: arm
+          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:beige-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 }}
+      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_BUILD: ${{ env.SHOULD_BUILD }}
+      SHOULD_DEPLOY: ${{ env.SHOULD_DEPLOY }}
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ env.GITHUB_BRANCH }}
+        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' && env.SHOULD_BUILD == 'yes'
+
+      - name: Install GH
+        run: ./install_gh.sh
+        if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
+
+      - name: Check existing VSCodium tags/releases
+        env:
+          CHECK_REH: 'no'
+          DISABLE_APPIMAGE: ${{ vars.DISABLE_INSIDER_APPIMAGE }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: ./check_tags.sh
+        if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes'
+
+      - name: Install libkrb5-dev
+        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@v4
+        with:
+          name: vscode
+        if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes'
 
       - name: Build
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           npm_config_arch: ${{ matrix.npm_arch }}
-        run: ./build.sh
-        if: env.SHOULD_BUILD == 'yes'
+        run: ./build/linux/package_bin.sh
+        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.test_asset_builder == '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:
+          FORCE_UPDATE: ${{ github.event.inputs.force_version }}
           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@v4
+        with:
+          name: bin-${{ matrix.vscode_arch }}
+          path: assets/
+          retention-days: 3
+        if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'no' && github.event.inputs.generate_assets == 'true'
+
+  reh_linux:
+    needs:
+      - check
+      - compile
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - slug: X64
+          vscode_arch: x64
+          npm_arch: x64
+        - slug: ARM64
+          vscode_arch: arm64
+          npm_arch: arm64
+        - slug: ARM32
+          vscode_arch: armhf
+          npm_arch: arm
+        - slug: PPC64
+          vscode_arch: ppc64le
+          npm_arch: ppc64
+        - 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 }}
+      SHOULD_BUILD: ${{ needs.check.outputs.SHOULD_BUILD }}
+      SHOULD_DEPLOY: ${{ needs.check.outputs.SHOULD_DEPLOY }}
+      VSCODE_ARCH: ${{ matrix.vscode_arch }}
+    if: needs.check.outputs.SHOULD_BUILD == 'yes' || github.event.inputs.generate_assets == 'true'
+
+    steps:
+      - 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: '20.18.2'
+        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 update -y && sudo apt-get install -y libkrb5-dev
+        if: env.DISABLED != 'yes'
+
+      - name: Install GH
+        run: ./install_gh.sh
+        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@v4
+        with:
+          name: vscode
+        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: ./build/linux/package_reh.sh
+        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.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
+        with:
+          name: reh-linux-${{ matrix.vscode_arch }}
+          path: assets/
+          retention-days: 3
+        if: env.DISABLED != 'yes' && env.SHOULD_DEPLOY == 'no' && github.event.inputs.generate_assets == 'true'
+
+  reh_alpine:
+    needs:
+      - check
+      - compile
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - slug: X64
+          vscode_arch: x64
+          npm_arch: x64
+        - slug: ARM64
+          vscode_arch: arm64
+          npm_arch: arm64
+    env:
+      BUILD_SOURCEVERSION: ${{ needs.compile.outputs.BUILD_SOURCEVERSION }}
+      DISABLED: ${{ vars[format('DISABLE_INSIDER_ALPINE_REH_{0}', matrix.slug)] }}
+      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 }}
+      VSCODE_ARCH: ${{ matrix.vscode_arch }}
+    if: needs.check.outputs.SHOULD_BUILD == 'yes' || github.event.inputs.generate_assets == 'true'
+
+    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 GCC
+        uses: egor-tensin/setup-gcc@v1
+        with:
+          version: 10
+          platform: x64
+
+      - name: Install GH
+        run: ./install_gh.sh
+        if: env.SHOULD_DEPLOY == 'yes'
+
+      - name: Check existing VSCodium tags/releases
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          CHECK_ONLY_REH: 'yes'
+        run: ./check_tags.sh
+
+      - name: Install 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@v4
+        with:
+          name: vscode
+        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: ./build/alpine/package_reh.sh
+        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.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
+        with:
+          name: reh-alpine-${{ matrix.vscode_arch }}
+          path: assets/
+          retention-days: 3
+        if: env.DISABLED != 'yes' && env.SHOULD_DEPLOY == 'no' && github.event.inputs.generate_assets == 'true'
 
   aur:
     needs:
+      - check
       - build
     runs-on: ubuntu-latest
     strategy:
@@ -196,12 +479,12 @@ jobs:
         include:
         - package_name: vscodium-insiders-bin
         - package_name: vscodium-insiders
-    if: needs.build.outputs.SHOULD_DEPLOY == 'yes'
+    if: needs.check.outputs.SHOULD_DEPLOY == 'yes' && github.event.inputs.generate_assets != 'true'
 
     steps:
       - name: Get version
         env:
-          RELEASE_VERSION: ${{ needs.build.outputs.RELEASE_VERSION }}
+          RELEASE_VERSION: ${{ needs.check.outputs.RELEASE_VERSION }}
         run: echo "PACKAGE_VERSION=${RELEASE_VERSION/-*/}" >> "${GITHUB_ENV}"
 
       - name: Publish ${{ matrix.package_name }}
@@ -215,50 +498,46 @@ jobs:
 
   snap:
     needs:
+      - check
       - build
     runs-on: ubuntu-latest
     env:
-      APP_NAME: codium
+      RELEASE_VERSION: ${{ needs.check.outputs.RELEASE_VERSION }}
+      SNAP_NAME: codium-insiders
     strategy:
       fail-fast: false
       matrix:
         platform:
         - amd64
         - arm64
-    # if: needs.build.outputs.SHOULD_DEPLOY == 'yes'
-    if: false
+    if: needs.check.outputs.SHOULD_DEPLOY == 'yes' && needs.check.outputs.SHOULD_BUILD_SNAP != 'no' && vars.DISABLE_INSIDER_SNAP != 'yes'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
-          ref: insider
+          ref: ${{ env.GITHUB_BRANCH }}
 
-      - name: Check version
+      - name: Switch to relevant branch
         env:
-          ARCHITECTURE: ${{ matrix.platform }}
-          SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_STORE_LOGIN }}
-        run: ./stores/snapcraft/check_version.sh
+          PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }}
+        run: ./get_pr.sh
 
-      - uses: docker/setup-qemu-action@v2
-        if: env.SHOULD_DEPLOY == 'yes'
+      - uses: docker/setup-qemu-action@v3
 
       - uses: diddlesnaps/snapcraft-multiarch-action@v1
         with:
           path: stores/snapcraft/insider
           architecture: ${{ matrix.platform }}
         id: build
-        if: env.SHOULD_DEPLOY == 'yes'
 
       - uses: diddlesnaps/snapcraft-review-action@v1
         with:
           snap: ${{ steps.build.outputs.snap }}
           isClassic: 'true'
-        if: env.SHOULD_DEPLOY == 'yes'
 
-      - uses: snapcore/action-publish@master
-        env:
-          SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_STORE_LOGIN }}
+      - uses: svenstaro/upload-release-action@v2
         with:
-          snap: ${{ steps.build.outputs.snap }}
-          release: edge
-        if: env.SHOULD_DEPLOY == 'yes'
+          repo_name: ${{ env.ASSETS_REPOSITORY }}
+          repo_token: ${{ secrets.STRONGER_GITHUB_TOKEN }}
+          file: ${{ steps.build.outputs.snap }}
+          tag: ${{ env.RELEASE_VERSION }}

.github/workflows/insider-macos.yml

@@ -3,21 +3,22 @@ name: insider-macos
 on:
   workflow_dispatch:
     inputs:
-      release_version:
+      force_version:
+        type: boolean
+        description: Force update version
+      generate_assets:
+        type: boolean
+        description: Generate assets
+      checkout_pr:
         type: string
-        description: Forced release version
-      new_release:
-        type: boolean
-        description: Force new Release
-      test_asset_builder:
-        type: boolean
-        description: Test the assets builder
-  schedule:
-    - cron: '0 8 * * *'
+        description: Checkout PR
+  repository_dispatch:
+    types: [insider]
   push:
     branches: [ insider ]
     paths-ignore:
     - '**/*.md'
+    - 'upstream/*.json'
   pull_request:
     branches: [ insider ]
     paths-ignore:
@@ -26,7 +27,10 @@ on:
 env:
   APP_NAME: VSCodium
   ASSETS_REPOSITORY: ${{ github.repository }}-insiders
-  GITHUB_BRANCH: insider
+  BINARY_NAME: codium-insiders
+  GITHUB_BRANCH: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || 'insider' }}
+  GH_REPO_PATH: ${{ github.repository_owner }}/${{ github.repository }}
+  ORG_NAME: ${{ github.repository_owner }}
   OS_NAME: osx
   VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
   VSCODE_QUALITY: insider
@@ -40,35 +44,43 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - runner: macos-12
+          - runner: macos-13
             vscode_arch: x64
           - runner: [self-hosted, macOS, ARM64]
             vscode_arch: arm64
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
-          ref: insider
+          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@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: '16'
+          node-version: '20.18.2'
+
+      - name: Setup Python 3
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+        if: env.VSCODE_ARCH == 'x64'
 
       - name: Clone VSCode repo
-        env:
-          RELEASE_VERSION: ${{ github.event.inputs.release_version }}
         run: . get_repo.sh
 
       - name: Check PR or cron
         env:
-          TEST_ASSET_BUILDER: ${{ github.event.inputs.test_asset_builder }}
+          GENERATE_ASSETS: ${{ github.event.inputs.generate_assets }}
         run: . check_cron_or_pr.sh
 
       - name: Check existing VSCodium tags/releases
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NEW_RELEASE: ${{ github.event.inputs.new_release }}
         run: . check_tags.sh
         if: env.SHOULD_DEPLOY == 'yes'
 
@@ -80,11 +92,13 @@ jobs:
 
       - name: Prepare assets
         env:
-          CERTIFICATE_OSX_P12: ${{ secrets.CERTIFICATE_OSX_P12 }}
-          CERTIFICATE_OSX_PASSWORD: ${{ secrets.CERTIFICATE_OSX_PASSWORD }}
-          CERTIFICATE_OSX_ID: ${{ secrets.CERTIFICATE_OSX_ID }}
+          CERTIFICATE_OSX_APP_PASSWORD: ${{ secrets.CERTIFICATE_OSX_NEW_APP_PASSWORD }}
+          CERTIFICATE_OSX_ID: ${{ secrets.CERTIFICATE_OSX_NEW_ID }}
+          CERTIFICATE_OSX_P12_DATA: ${{ secrets.CERTIFICATE_OSX_NEW_P12_DATA }}
+          CERTIFICATE_OSX_P12_PASSWORD: ${{ secrets.CERTIFICATE_OSX_NEW_P12_PASSWORD }}
+          CERTIFICATE_OSX_TEAM_ID: ${{ secrets.CERTIFICATE_OSX_NEW_TEAM_ID }}
         run: ./prepare_assets.sh
-        if: env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.test_asset_builder == 'true')
+        if: env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true')
 
       - name: Release
         env:
@@ -95,11 +109,20 @@ jobs:
 
       - name: Update versions repo
         env:
+          FORCE_UPDATE: ${{ github.event.inputs.force_version }}
           GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }}
           GITHUB_USERNAME: ${{ github.repository_owner }}
         run: ./update_version.sh
         if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
 
+      - name: Upload assets
+        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'
+
       - name: Clean up keychain
         if: always()
         run: |

.github/workflows/insider-spearhead.yml

@@ -2,30 +2,46 @@ name: insider-spearhead
 
 on:
   workflow_dispatch:
+    inputs:
+      new_release:
+        type: boolean
+        description: Force new Release
+      force_dispatch:
+        type: boolean
+        description: Force dispatch
+      dont_update:
+        type: boolean
+        description: Don't update VSCode
+      dont_dispatch:
+        type: boolean
+        description: Disable dispatch
   schedule:
     - cron: '0 7 * * *'
 
 jobs:
   build:
-    runs-on: [self-hosted, macOS, ARM64]
+    runs-on: macos-14
     env:
       APP_NAME: VSCodium
       ASSETS_REPOSITORY: ${{ github.repository }}-insiders
-      VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
+      BINARY_NAME: codium-insiders
+      GH_REPO_PATH: ${{ github.repository_owner }}/${{ github.repository }}
+      ORG_NAME: ${{ github.repository_owner }}
       OS_NAME: osx
+      VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
       VSCODE_ARCH: arm64
-      VSCODE_LATEST: yes
+      VSCODE_LATEST: ${{ github.event.inputs.dont_update == 'true' && 'no' || 'yes' }}
       VSCODE_QUALITY: insider
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: insider
 
       - name: Setup Node.js environment
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: '16'
+          node-version: '20.18.2'
 
       - name: Clone VSCode repo
         run: . get_repo.sh
@@ -33,36 +49,42 @@ jobs:
       - name: Check existing VSCodium tags/releases
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NEW_RELEASE: ${{ github.event.inputs.new_release }}
+          IS_SPEARHEAD: 'yes'
         run: . check_tags.sh
 
-      - name: Compute cache key
-        id: yarnCacheKey
-        run: echo "value=$(node build/azure-pipelines/computeYarnCacheKey.js)" >> $GITHUB_OUTPUT
-        if: env.SHOULD_BUILD == 'yes'
-
-      - name: Get yarn cache directory path
-        id: yarnCacheDirPath
-        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
-        if: env.SHOULD_BUILD == 'yes'
-
-      - name: Cache yarn directory
-        uses: actions/cache@v3
-        with:
-          path: ${{ steps.yarnCacheDirPath.outputs.dir }}
-          key: ${{ env.OS_NAME }}-${{ env.VSCODE_ARCH }}-yarnCacheDir-${{ steps.yarnCacheKey.outputs.value }}
-          restore-keys: ${{ env.OS_NAME }}-${{ env.VSCODE_ARCH }}-yarnCacheDir-
-        if: env.SHOULD_BUILD == 'yes'
-
       - name: Build
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: ./build.sh
         if: env.SHOULD_BUILD == 'yes'
 
-      - name: Update insider.json
-        run: ./update_insider.sh
+      - name: Import GPG key
+        uses: crazy-max/ghaction-import-gpg@v6
+        with:
+          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+          passphrase: ${{ secrets.GPG_PASSPHRASE }}
+          git_user_signingkey: true
+          git_commit_gpgsign: true
+        if: env.SHOULD_BUILD == 'yes' && github.event.inputs.dont_update != 'true'
+
+      - name: Update upstream version
+        run: ./update_upstream.sh
+        if: env.SHOULD_BUILD == 'yes' && github.event.inputs.dont_update != 'true'
+
+      - name: Prepare source
+        run: ./prepare_src.sh
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Release source
         env:
           GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }}
           GITHUB_USERNAME: ${{ github.repository_owner }}
+        run: ./release.sh
         if: env.SHOULD_BUILD == 'yes'
 
+      - name: Dispatch builds
+        uses: peter-evans/repository-dispatch@v3
+        with:
+          event-type: 'insider'
+        if: github.event.inputs.dont_dispatch != 'true' && (env.SHOULD_BUILD == 'yes' || github.event.inputs.force_dispatch == 'true')

.github/workflows/insider-windows.yml

@@ -3,21 +3,22 @@ name: insider-windows
 on:
   workflow_dispatch:
     inputs:
-      release_version:
+      force_version:
+        type: boolean
+        description: Force update version
+      generate_assets:
+        type: boolean
+        description: Generate assets
+      checkout_pr:
         type: string
-        description: Forced release version
-      new_release:
-        type: boolean
-        description: Force new Release
-      test_asset_builder:
-        type: boolean
-        description: Test the assets builder
-  schedule:
-    - cron: '0 8 * * *'
+        description: Checkout PR
+  repository_dispatch:
+    types: [insider]
   push:
     branches: [ insider ]
     paths-ignore:
     - '**/*.md'
+    - 'upstream/*.json'
   pull_request:
     branches: [ insider ]
     paths-ignore:
@@ -26,76 +27,233 @@ on:
 env:
   APP_NAME: VSCodium
   ASSETS_REPOSITORY: ${{ github.repository }}-insiders
-  GITHUB_BRANCH: insider
+  BINARY_NAME: codium-insiders
+  GITHUB_BRANCH: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || 'insider' }}
+  GH_REPO_PATH: ${{ github.repository_owner }}/${{ github.repository }}
+  ORG_NAME: ${{ github.repository_owner }}
   OS_NAME: windows
   VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
   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:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ env.GITHUB_BRANCH }}
 
-      - name: Setup Node.js environment
-        uses: actions/setup-node@v3
-        with:
-          node-version: '16'
-
-      - name: Install Yarn
-        run: npm install -g yarn
-
-      - name: Setup Python 3
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.x'
+      - name: Switch to relevant branch
+        env:
+          PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }}
+        run: ./get_pr.sh
 
       - name: Clone VSCode repo
-        env:
-          RELEASE_VERSION: ${{ github.event.inputs.release_version }}
         run: ./get_repo.sh
 
       - name: Check PR or cron
         env:
-          TEST_ASSET_BUILDER: ${{ github.event.inputs.test_asset_builder }}
+          GENERATE_ASSETS: ${{ github.event.inputs.generate_assets }}
         run: ./check_cron_or_pr.sh
 
       - name: Check existing VSCodium tags/releases
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NEW_RELEASE: ${{ github.event.inputs.new_release }}
+          CHECK_ALL: 'yes'
         run: ./check_tags.sh
-        if: env.SHOULD_DEPLOY == 'yes'
+
+  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.2'
+        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.2'
+        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: ./build/windows/package.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.test_asset_builder == 'true')
+        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:
@@ -106,11 +264,20 @@ jobs:
 
       - name: Update versions repo
         env:
+          FORCE_UPDATE: ${{ github.event.inputs.force_version }}
           GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }}
           GITHUB_USERNAME: ${{ github.repository_owner }}
         run: ./update_version.sh
         if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
 
+      - name: Upload assets
+        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'
+
   winget:
     needs: build
     runs-on: windows-latest
@@ -123,7 +290,7 @@ jobs:
     if: needs.build.outputs.SHOULD_DEPLOY == 'yes'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ env.GITHUB_BRANCH }}
 
@@ -133,7 +300,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/lock.yml

@@ -8,7 +8,7 @@ jobs:
   lock:
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v4
+      - uses: dessant/lock-threads@v5
         with:
           github-token: ${{ github.token }}
           issue-inactive-days: '90'

.github/workflows/stable-linux.yml

@@ -3,29 +3,35 @@ name: stable-linux
 on:
   workflow_dispatch:
     inputs:
-      new_release:
-        type: boolean
-        description: Force new Release
       force_version:
         type: boolean
         description: Force update version
-      test_asset_builder:
+      generate_assets:
         type: boolean
-        description: Test the assets builder
-  schedule:
-    - cron: '0 18 * * *'
+        description: Generate assets
+      checkout_pr:
+        type: string
+        description: Checkout PR
+  repository_dispatch:
+    types: [stable]
   push:
     branches: [ master ]
     paths-ignore:
     - '**/*.md'
+    - 'upstream/*.json'
   pull_request:
     branches: [ master ]
     paths-ignore:
     - '**/*.md'
 
 env:
+  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
   APP_NAME: VSCodium
   ASSETS_REPOSITORY: ${{ github.repository }}
+  BINARY_NAME: codium
+  DISABLE_UPDATE: 'yes'
+  GH_REPO_PATH: ${{ github.repository_owner }}/${{ github.repository }}
+  ORG_NAME: ${{ github.repository_owner }}
   OS_NAME: linux
   VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
   VSCODE_QUALITY: stable
@@ -33,8 +39,6 @@ env:
 jobs:
   check:
     runs-on: ubuntu-latest
-    container:
-      image: vscodium/vscodium-linux-build-agent:bionic-x64
     outputs:
       MS_COMMIT: ${{ env.MS_COMMIT }}
       MS_TAG: ${{ env.MS_TAG }}
@@ -43,135 +47,211 @@ jobs:
       SHOULD_DEPLOY: ${{ env.SHOULD_DEPLOY }}
 
     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: Clone VSCode repo
         run: ./get_repo.sh
 
       - name: Check PR or cron
         env:
-          TEST_ASSET_BUILDER: ${{ github.event.inputs.test_asset_builder }}
+          GENERATE_ASSETS: ${{ github.event.inputs.generate_assets }}
         run: ./check_cron_or_pr.sh
 
-  dependencies:
-    needs:
-      - check
-    runs-on: ubuntu-latest
-    env:
-      MS_COMMIT: ${{ needs.check.outputs.MS_COMMIT }}
-      MS_TAG: ${{ needs.check.outputs.MS_TAG }}
-      RELEASE_VERSION: ${{ needs.check.outputs.RELEASE_VERSION }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-        - vscode_arch: x64
-          image: vscodium/vscodium-linux-build-agent:centos7-devtoolset8-x64
-        # - vscode_arch: arm64
-        #   image: vscodium/vscodium-linux-build-agent:centos7-devtoolset8-arm64
-    container:
-      image: ${{ matrix.image }}
-    if: needs.check.outputs.SHOULD_BUILD == 'yes' || needs.check.outputs.SHOULD_DEPLOY == 'yes'
-
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          ref: ${{ env.GITHUB_BRANCH }}
-
-      - name: Clone VSCode repo
-        run: ./get_repo.sh
-
-      - uses: docker/setup-qemu-action@v2
-        if: matrix.vscode_arch == 'arm64' || matrix.vscode_arch == 'ppc64le'
-
-      - name: Install remote dependencies
-        run: ./install_remote_dependencies.sh
-
-      - name: Save remote dependencies
-        uses: actions/upload-artifact@v3
-        with:
-          name: remote-dependencies-${{ matrix.vscode_arch }}
-          path: ./remote-dependencies.tar
-          retention-days: ${{ needs.check.outputs.SHOULD_DEPLOY == 'yes' && 30 || 1 }}
-
-  build:
-    needs:
-      - check
-      - dependencies
-    runs-on: ubuntu-latest
-    env:
-      DISABLE_UPDATE: 'yes'
-      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 }}
-      SHOULD_DEPLOY: ${{ needs.check.outputs.SHOULD_DEPLOY }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-        - vscode_arch: x64
-          npm_arch: x64
-          image: vscodium/vscodium-linux-build-agent:bionic-x64
-        - vscode_arch: arm64
-          npm_arch: arm64
-          image: vscodium/vscodium-linux-build-agent:bionic-arm64
-        - vscode_arch: armhf
-          npm_arch: arm
-          image: vscodium/vscodium-linux-build-agent:bionic-armhf
-        - vscode_arch: ppc64le
-          npm_arch: ppc64
-          image: vscodium/vscodium-linux-build-agent:bionic-ppc64le
-    container:
-      image: ${{ matrix.image }}
-      env:
-        VSCODE_ARCH: ${{ matrix.vscode_arch }}
-    outputs:
-      RELEASE_VERSION: ${{ env.RELEASE_VERSION }}
-      SHOULD_BUILD: ${{ env.SHOULD_BUILD }}
-      SHOULD_DEPLOY: ${{ env.SHOULD_DEPLOY }}
-    if: needs.check.outputs.SHOULD_BUILD == 'yes' || needs.check.outputs.SHOULD_DEPLOY == 'yes'
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Clone VSCode repo
-        run: ./get_repo.sh
-
-      - name: Install GH
-        run: ./install_gh.sh
-
       - name: Check existing VSCodium tags/releases
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NEW_RELEASE: ${{ github.event.inputs.new_release }}
+          CHECK_ALL: 'yes'
         run: ./check_tags.sh
-        if: env.SHOULD_DEPLOY == 'yes'
 
-      - name: Restore remote dependencies
-        uses: actions/download-artifact@v3
+  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:
-          name: remote-dependencies-${{ matrix.vscode_arch }}
-        if: env.SHOULD_BUILD == 'yes' && matrix.vscode_arch == 'x64'
+          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 GCC
+        uses: egor-tensin/setup-gcc@v1
+        with:
+          version: 10
+          platform: x64
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Setup Node.js environment
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20.18.2'
+        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: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - slug: X64
+          vscode_arch: x64
+          npm_arch: x64
+          image: vscodium/vscodium-linux-build-agent:focal-x64
+        - slug: ARM64
+          vscode_arch: arm64
+          npm_arch: arm64
+          image: vscodium/vscodium-linux-build-agent:focal-arm64
+        - slug: ARM32
+          vscode_arch: armhf
+          npm_arch: arm
+          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:beige-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 }}
+      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_BUILD: ${{ env.SHOULD_BUILD }}
+      SHOULD_DEPLOY: ${{ env.SHOULD_DEPLOY }}
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ env.GITHUB_BRANCH }}
+        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.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
+
+      - name: Check existing VSCodium tags/releases
+        env:
+          CHECK_REH: 'no'
+          DISABLE_APPIMAGE: ${{ vars.DISABLE_STABLE_APPIMAGE }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: ./check_tags.sh
+        if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes'
+
+      - name: Install libkrb5-dev
+        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@v4
+        with:
+          name: vscode
+        if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes'
 
       - name: Build
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           npm_config_arch: ${{ matrix.npm_arch }}
-        run: ./build.sh
-        if: env.SHOULD_BUILD == 'yes'
+        run: ./build/linux/package_bin.sh
+        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.test_asset_builder == '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.GITHUB_TOKEN }}
+          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:
@@ -179,10 +259,219 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }}
           GITHUB_USERNAME: ${{ github.repository_owner }}
         run: ./update_version.sh
+        if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
+
+      - name: Upload assets
+        uses: actions/upload-artifact@v4
+        with:
+          name: bin-${{ matrix.vscode_arch }}
+          path: assets/
+          retention-days: 3
+        if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'no' && github.event.inputs.generate_assets == 'true'
+
+  reh_linux:
+    needs:
+      - check
+      - compile
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - slug: X64
+          vscode_arch: x64
+          npm_arch: x64
+        - slug: ARM64
+          vscode_arch: arm64
+          npm_arch: arm64
+        - slug: ARM32
+          vscode_arch: armhf
+          npm_arch: arm
+        - slug: PPC64
+          vscode_arch: ppc64le
+          npm_arch: ppc64
+        - 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 }}
+      SHOULD_BUILD: ${{ needs.check.outputs.SHOULD_BUILD }}
+      SHOULD_DEPLOY: ${{ needs.check.outputs.SHOULD_DEPLOY }}
+      VSCODE_ARCH: ${{ matrix.vscode_arch }}
+    if: needs.check.outputs.SHOULD_BUILD == 'yes' || github.event.inputs.generate_assets == 'true'
+
+    steps:
+      - 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: '20.18.2'
+        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 update -y && sudo apt-get install -y libkrb5-dev
+        if: env.DISABLED != 'yes'
+
+      - name: Install GH
+        run: ./install_gh.sh
+        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@v4
+        with:
+          name: vscode
+        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: ./build/linux/package_reh.sh
+        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.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
+        with:
+          name: reh-linux-${{ matrix.vscode_arch }}
+          path: assets/
+          retention-days: 3
+        if: env.DISABLED != 'yes' && env.SHOULD_DEPLOY == 'no' && github.event.inputs.generate_assets == 'true'
+
+  reh_alpine:
+    needs:
+      - check
+      - compile
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - slug: X64
+          vscode_arch: x64
+          npm_arch: x64
+        - slug: ARM64
+          vscode_arch: arm64
+          npm_arch: arm64
+    env:
+      BUILD_SOURCEVERSION: ${{ needs.compile.outputs.BUILD_SOURCEVERSION }}
+      DISABLED: ${{ vars[format('DISABLE_STABLE_ALPINE_REH_{0}', matrix.slug)] }}
+      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 }}
+      VSCODE_ARCH: ${{ matrix.vscode_arch }}
+    if: needs.check.outputs.SHOULD_BUILD == 'yes' || github.event.inputs.generate_assets == 'true'
+
+    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 GCC
+        uses: egor-tensin/setup-gcc@v1
+        with:
+          version: 10
+          platform: x64
+
+      - name: Install GH
+        run: ./install_gh.sh
         if: env.SHOULD_DEPLOY == 'yes'
 
+      - name: Check existing VSCodium tags/releases
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          CHECK_ONLY_REH: 'yes'
+        run: ./check_tags.sh
+
+      - name: Install 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@v4
+        with:
+          name: vscode
+        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: ./build/alpine/package_reh.sh
+        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.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
+        with:
+          name: reh-alpine-${{ matrix.vscode_arch }}
+          path: assets/
+          retention-days: 3
+        if: env.DISABLED != 'yes' && env.SHOULD_DEPLOY == 'no' && github.event.inputs.generate_assets == 'true'
+
   aur:
     needs:
+      - check
       - build
     runs-on: ubuntu-latest
     strategy:
@@ -191,9 +480,9 @@ jobs:
         include:
         - package_name: vscodium
           package_type: stable
-        - package_name: vscodium-git
-          package_type: rolling
-    if: needs.build.outputs.SHOULD_DEPLOY == 'yes'
+        # - package_name: vscodium-git
+        #   package_type: rolling
+    if: needs.check.outputs.SHOULD_DEPLOY == 'yes'
 
     steps:
       - name: Publish ${{ matrix.package_name }}
@@ -207,56 +496,76 @@ jobs:
 
   snap:
     needs:
+      - check
       - build
     runs-on: ubuntu-latest
     env:
-      APP_NAME: codium
+      RELEASE_VERSION: ${{ needs.check.outputs.RELEASE_VERSION }}
+      SNAP_NAME: codium
     strategy:
       fail-fast: false
       matrix:
         platform:
         - amd64
         - arm64
-    if: needs.build.outputs.SHOULD_DEPLOY == 'yes'
+    if: needs.check.outputs.SHOULD_DEPLOY == 'yes' && needs.check.outputs.SHOULD_BUILD_SNAP != 'no' && 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
 
-      - uses: docker/setup-qemu-action@v2
-        if: env.SHOULD_DEPLOY == 'yes'
+      - uses: docker/setup-qemu-action@v3
+        if: env.SHOULD_BUILD == 'yes'
 
       - uses: diddlesnaps/snapcraft-multiarch-action@v1
         with:
           path: stores/snapcraft/stable
           architecture: ${{ matrix.platform }}
         id: build
-        if: env.SHOULD_DEPLOY == 'yes'
+        if: env.SHOULD_BUILD == 'yes'
 
       - uses: diddlesnaps/snapcraft-review-action@v1
         with:
           snap: ${{ steps.build.outputs.snap }}
           isClassic: 'true'
-        if: env.SHOULD_DEPLOY == 'yes'
+        if: env.SHOULD_DEPLOY_TO_RELEASE == 'yes' || env.SHOULD_DEPLOY_TO_STORE == 'yes'
+
+      - uses: svenstaro/upload-release-action@v2
+        with:
+          repo_name: ${{ env.ASSETS_REPOSITORY }}
+          repo_token: ${{ secrets.STRONGER_GITHUB_TOKEN }}
+          file: ${{ steps.build.outputs.snap }}
+          tag: ${{ env.RELEASE_VERSION }}
+        if: env.SHOULD_DEPLOY_TO_RELEASE == 'yes'
 
       - uses: snapcore/action-publish@master
         env:
           SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_STORE_LOGIN }}
         with:
           snap: ${{ steps.build.outputs.snap }}
-          release: stable
-        if: env.SHOULD_DEPLOY == 'yes'
+          release: ${{ vars.SNAP_STORE_CHANNEL }}
+        if: env.SHOULD_DEPLOY_TO_STORE == 'yes'
 
   deb-rpm-repo-hook:
     needs:
+      - check
       - build
     runs-on: ubuntu-latest
-    if: needs.build.outputs.SHOULD_DEPLOY == 'yes'
+    if: needs.check.outputs.SHOULD_DEPLOY == 'yes'
 
     steps:
       - name: Trigger repository rebuild

.github/workflows/stable-macos.yml

@@ -3,21 +3,22 @@ name: stable-macos
 on:
   workflow_dispatch:
     inputs:
-      new_release:
-        type: boolean
-        description: Force new Release
       force_version:
         type: boolean
         description: Force update version
-      test_asset_builder:
+      generate_assets:
         type: boolean
-        description: Test the assets builder
-  schedule:
-    - cron: '0 18 * * *'
+        description: Generate assets
+      checkout_pr:
+        type: string
+        description: Checkout PR
+  repository_dispatch:
+    types: [stable]
   push:
     branches: [ master ]
     paths-ignore:
     - '**/*.md'
+    - 'upstream/*.json'
   pull_request:
     branches: [ master ]
     paths-ignore:
@@ -26,6 +27,9 @@ on:
 env:
   APP_NAME: VSCodium
   ASSETS_REPOSITORY: ${{ github.repository }}
+  BINARY_NAME: codium
+  GH_REPO_PATH: ${{ github.repository_owner }}/${{ github.repository }}
+  ORG_NAME: ${{ github.repository_owner }}
   OS_NAME: osx
   VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
   VSCODE_QUALITY: stable
@@ -39,31 +43,43 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - runner: macos-12
+          - runner: macos-13
             vscode_arch: x64
           - runner: [self-hosted, macOS, ARM64]
             vscode_arch: arm64
 
     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 Node.js environment
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: '16'
+          node-version: '20.18.2'
+
+      - name: Setup Python 3
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+        if: env.VSCODE_ARCH == 'x64'
 
       - name: Clone VSCode repo
         run: . get_repo.sh
 
       - name: Check PR or cron
         env:
-          TEST_ASSET_BUILDER: ${{ github.event.inputs.test_asset_builder }}
+          GENERATE_ASSETS: ${{ github.event.inputs.generate_assets }}
         run: . check_cron_or_pr.sh
 
       - name: Check existing VSCodium tags/releases
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NEW_RELEASE: ${{ github.event.inputs.new_release }}
         run: . check_tags.sh
         if: env.SHOULD_DEPLOY == 'yes'
 
@@ -75,11 +91,13 @@ jobs:
 
       - name: Prepare assets
         env:
-          CERTIFICATE_OSX_P12: ${{ secrets.CERTIFICATE_OSX_P12 }}
-          CERTIFICATE_OSX_PASSWORD: ${{ secrets.CERTIFICATE_OSX_PASSWORD }}
-          CERTIFICATE_OSX_ID: ${{ secrets.CERTIFICATE_OSX_ID }}
+          CERTIFICATE_OSX_APP_PASSWORD: ${{ secrets.CERTIFICATE_OSX_NEW_APP_PASSWORD }}
+          CERTIFICATE_OSX_ID: ${{ secrets.CERTIFICATE_OSX_NEW_ID }}
+          CERTIFICATE_OSX_P12_DATA: ${{ secrets.CERTIFICATE_OSX_NEW_P12_DATA }}
+          CERTIFICATE_OSX_P12_PASSWORD: ${{ secrets.CERTIFICATE_OSX_NEW_P12_PASSWORD }}
+          CERTIFICATE_OSX_TEAM_ID: ${{ secrets.CERTIFICATE_OSX_NEW_TEAM_ID }}
         run: ./prepare_assets.sh
-        if: env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.test_asset_builder == 'true')
+        if: env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true')
 
       - name: Release
         env:
@@ -95,6 +113,14 @@ jobs:
         run: ./update_version.sh
         if: env.SHOULD_DEPLOY == 'yes'
 
+      - name: Upload assets
+        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'
+
       - name: Clean up keychain
         if: always()
         run: |

.github/workflows/stable-spearhead.yml

@@ -0,0 +1,85 @@
+name: stable-spearhead
+
+on:
+  workflow_dispatch:
+    inputs:
+      new_release:
+        type: boolean
+        description: Force new Release
+      force_dispatch:
+        type: boolean
+        description: Force dispatch
+      dont_update:
+        type: boolean
+        description: Don't update VSCode
+  schedule:
+    - cron: '0 18 * * *'
+
+jobs:
+  build:
+    runs-on: macos-14
+    env:
+      APP_NAME: VSCodium
+      ASSETS_REPOSITORY: ${{ github.repository }}
+      BINARY_NAME: codium
+      GH_REPO_PATH: ${{ github.repository_owner }}/${{ github.repository }}
+      ORG_NAME: ${{ github.repository_owner }}
+      OS_NAME: osx
+      VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
+      VSCODE_ARCH: arm64
+      VSCODE_LATEST: ${{ github.event.inputs.dont_update == 'true' && 'no' || 'yes' }}
+      VSCODE_QUALITY: stable
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup Node.js environment
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20.18.2'
+
+      - name: Clone VSCode repo
+        run: . get_repo.sh
+
+      - name: Check existing VSCodium tags/releases
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NEW_RELEASE: ${{ github.event.inputs.new_release }}
+          IS_SPEARHEAD: 'yes'
+        run: . check_tags.sh
+
+      - name: Build
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: ./build.sh
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Import GPG key
+        uses: crazy-max/ghaction-import-gpg@v6
+        with:
+          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+          passphrase: ${{ secrets.GPG_PASSPHRASE }}
+          git_user_signingkey: true
+          git_commit_gpgsign: true
+        if: env.SHOULD_BUILD == 'yes' && github.event.inputs.dont_update != 'true'
+
+      - name: Update upstream version
+        run: ./update_upstream.sh
+        if: env.SHOULD_BUILD == 'yes' && github.event.inputs.dont_update != 'true'
+
+      - name: Prepare source
+        run: ./prepare_src.sh
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Release source
+        env:
+          GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }}
+          GITHUB_USERNAME: ${{ github.repository_owner }}
+        run: ./release.sh
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Dispatch builds
+        uses: peter-evans/repository-dispatch@v3
+        with:
+          event-type: 'stable'
+        if: env.SHOULD_BUILD == 'yes' || github.event.inputs.force_dispatch == 'true'

.github/workflows/stable-windows.yml

@@ -3,21 +3,22 @@ name: stable-windows
 on:
   workflow_dispatch:
     inputs:
-      new_release:
-        type: boolean
-        description: Force new Release
       force_version:
         type: boolean
         description: Force update version
-      test_asset_builder:
+      generate_assets:
         type: boolean
-        description: Test the assets builder
-  schedule:
-    - cron: '0 18 * * *'
+        description: Generate assets
+      checkout_pr:
+        type: string
+        description: Checkout PR
+  repository_dispatch:
+    types: [stable]
   push:
     branches: [ master ]
     paths-ignore:
     - '**/*.md'
+    - 'upstream/*.json'
   pull_request:
     branches: [ master ]
     paths-ignore:
@@ -26,72 +27,232 @@ on:
 env:
   APP_NAME: VSCodium
   ASSETS_REPOSITORY: ${{ github.repository }}
+  BINARY_NAME: codium
+  GH_REPO_PATH: ${{ github.repository_owner }}/${{ github.repository }}
+  ORG_NAME: ${{ github.repository_owner }}
   OS_NAME: windows
   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@v3
-
-      - name: Setup Node.js environment
-        uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
         with:
-          node-version: '16'
+          ref: ${{ env.GITHUB_BRANCH }}
 
-      - name: Install Yarn
-        run: npm install -g yarn
-
-      - name: Setup Python 3
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.x'
+      - 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
         env:
-          TEST_ASSET_BUILDER: ${{ github.event.inputs.test_asset_builder }}
+          GENERATE_ASSETS: ${{ github.event.inputs.generate_assets }}
         run: ./check_cron_or_pr.sh
 
       - name: Check existing VSCodium tags/releases
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NEW_RELEASE: ${{ github.event.inputs.new_release }}
+          CHECK_ALL: 'yes'
         run: ./check_tags.sh
-        if: env.SHOULD_DEPLOY == 'yes'
+
+  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.2'
+        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.2'
+        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 }}
           npm_config_arch: ${{ matrix.vscode_arch }}
           npm_config_target_arch: ${{ matrix.vscode_arch }}
-        run: ./build.sh
+        run: ./build/windows/package.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.test_asset_builder == 'true')
+        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:
@@ -105,7 +266,15 @@ 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
+        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'
 
   winget:
     needs: build
@@ -118,7 +287,9 @@ jobs:
     if: needs.build.outputs.SHOULD_DEPLOY == 'yes'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ env.GITHUB_BRANCH }}
 
       - name: Check version
         run: ./stores/winget/check_version.sh
@@ -126,7 +297,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

@@ -11,7 +11,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v8
+      - uses: actions/stale@v9
         with:
           days-before-stale: 180
           days-before-close: 30
@@ -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

.gitignore

@@ -8,9 +8,11 @@ assets/
 build/linux/appimage/out
 build/linux/appimage/pkg2appimage.AppDir
 build/linux/appimage/pkg2appimage-*.AppImage
+build/linux/appimage/pkg2appimage.AppImage
 build/linux/appimage/squashfs-root
 build/linux/appimage/VSCodium
 build/windows/msi/releasedir
 build/windows/msi/Files*.wxs
 build/windows/msi/Files*.wixobj
-remote-dependencies.tar
+stores/snapcraft/insider/*.snap
+stores/snapcraft/stable/*.snap

.nvmrc

@@ -1 +1 @@
-16.20
+20.18.1

CONTRIBUTING.md

@@ -0,0 +1,42 @@
+# Contributing
+
+:+1::tada: First off, thanks for taking the time to contribute! :tada::+1:
+
+#### Table Of Contents
+
+- [Code of Conduct](#code-of-conduct)
+- [Reporting Bugs](#reporting-bugs)
+- [Making Changes](#making-changes)
+
+## Code of Conduct
+
+This project and everyone participating in it is governed by the [VSCodium Code of Conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code.
+
+## Reporting Bugs
+
+### Before Submitting an Issue
+
+Before creating bug reports, please check existing issues and [the Troubleshooting page](https://github.com/VSCodium/vscodium/blob/master/docs/troubleshooting.md) as you might find out that you don't need to create one.
+When you are creating a bug report, please include as many details as possible. Fill out [the required template](https://github.com/VSCodium/vscodium/issues/new?&labels=bug&&template=bug_report.md), the information it asks for helps us resolve issues faster.
+
+## Making Changes
+
+If you want to make changes, please read [the Build page](./docs/howto-build.md).
+
+### Building VSCodium
+
+To build VSCodium, please follow the command found in the section [`Build Scripts`](./docs/howto-build.md#build-scripts).
+
+### Updating patches
+
+If you want to update the existing patches, please follow the section [`Patch Update Process - Semi-Automated`](./docs/howto-build.md#patch-update-process-semiauto).
+
+### Add a new patch
+
+- first, you need to build VSCodium
+- then use the command `./dev/patch.sh <your patch name>`, to initiate a new patch
+- when the script pauses at `Press any key when the conflict have been resolved...`, open `vscode` directory in **VSCodium**
+- run `yarn watch`
+- run `./script/code.sh`
+- make your changes
+- press any key to continue the script `patch.sh`

FUNDING.json

@@ -0,0 +1,7 @@
+{
+  "drips": {
+    "ethereum": {
+      "ownedBy": "0x7806393Cb27692C6A52eE3D5338A75cECD168219"
+    }
+  }
+}

README.md

@@ -19,7 +19,7 @@
 
 </div>
 
-**This is not a fork. This is a repository of scripts to automatically build Microsoft's `vscode` repository into freely-licensed binaries with a community-driven default configuration.**
+**This is not a fork. This is a repository of scripts to automatically build [Microsoft's `vscode` repository](https://github.com/microsoft/vscode) into freely-licensed binaries with a community-driven default configuration.**
 
 ## Table of Contents
 
@@ -39,31 +39,49 @@
 
 ## <a id="download-install"></a>Download/Install
 
-:tada: :tada: [Download latest release here](https://github.com/VSCodium/vscodium/releases) :tada: :tada:
+:tada: :tada:
+Download latest release here:
+[stable](https://github.com/VSCodium/vscodium/releases) or
+[insiders](https://github.com/VSCodium/vscodium-insiders/releases)
+:tada: :tada:
+
+[More info / helpful tips are here.](https://github.com/VSCodium/vscodium/blob/master/docs/index.md)
 
-[More info / helpful tips are here.](https://github.com/VSCodium/vscodium/blob/master/DOCS.md)
 
 #### <a id="install-with-brew"></a>Install with Brew (Mac)
 
 If you are on a Mac and have [Homebrew](https://brew.sh/) installed:
 ```bash
+# stable
 brew install --cask vscodium
+
+# insiders
+brew tap homebrew/cask-versions
+brew install --cask vscodium-insiders
 ```
 
-*Note for macOS users: if you can't open the App, please read [the following troubleshooting](https://github.com/VSCodium/vscodium/wiki/Troubleshooting#macos).*
+*Note for macOS users: if you can't open the App, please read [the following troubleshooting](https://github.com/VSCodium/vscodium/blob/master/docs/troubleshooting.md#macos).*
 
 #### <a id="install-with-winget"></a>Install with Windows Package Manager (WinGet)
 
 If you use Windows and have [Windows Package Manager](https://github.com/microsoft/winget-cli) installed:
-```bash
-winget install vscodium
+```cmd
+:: stable
+winget install -e --id VSCodium.VSCodium
+
+:: insider
+winget install -e --id VSCodium.VSCodium.Insiders
 ```
 
 #### <a id="install-with-choco"></a>Install with Chocolatey (Windows)
 
 If you use Windows and have [Chocolatey](https://chocolatey.org) installed (thanks to [@Thilas](https://github.com/Thilas)):
-```bash
+```cmd
+:: stable
 choco install vscodium
+
+:: insider
+choco install vscodium-insiders
 ```
 
 #### <a id="install-with-scoop"></a>Install with Scoop (Windows)
@@ -78,30 +96,41 @@ scoop install vscodium
 
 VSCodium is available in the [Snap Store](https://snapcraft.io/) as [Codium](https://snapcraft.io/codium), thanks to the help of the [Snapcrafters](https://github.com/snapcrafters/codium) community.
 If your GNU/Linux distribution has support for [snaps](https://snapcraft.io/docs/installing-snapd):
+
 ```bash
 snap install codium --classic
 ```
 
 #### <a id="install-with-package-manager"></a>Install with Package Manager (GNU/Linux)
 
-You can always install using the downloads (deb, rpm, tar) on the [releases page](https://github.com/VSCodium/vscodium/releases), but you can also install using your favorite package manager and get automatic updates. [@paulcarroty](https://github.com/paulcarroty) has set up a repository with instructions [here](https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo). Any issues installing VSCodium using your package manager should be directed to that repository's issue tracker.
+You can always install using the downloads (deb, rpm, tar) on the releases page for [stable](https://github.com/VSCodium/vscodium/releases) or [insiders](https://github.com/VSCodium/vscodium-insiders/releases), but you can also install using your favorite package manager and get automatic updates.
+
+[@paulcarroty](https://github.com/paulcarroty) has set up a repository with instructions for `apt`, `dnf` and `zypper` [here](https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo).
+
+Any issues installing VSCodium using your package manager should be directed to that repository's issue tracker.
 
 #### <a id="install-on-arch-linux"></a>Install on Arch Linux
 
-VSCodium is available in [AUR](https://wiki.archlinux.org/index.php/Arch_User_Repository) as package [vscodium-bin](https://aur.archlinux.org/packages/vscodium-bin/), maintained by [@binex-dsk](https://github.com/binex-dsk). An alternative package [vscodium-git](https://aur.archlinux.org/packages/vscodium-git/), maintained by [@cedricroijakkers](https://github.com/cedricroijakkers), is also available should you wish to compile from source yourself.
+VSCodium is available in [AUR](https://wiki.archlinux.org/index.php/Arch_User_Repository), maintained by [@binex-dsk](https://github.com/binex-dsk) as package [vscodium-bin](https://aur.archlinux.org/packages/vscodium-bin/) (stable) and as [vscodium-insiders-bin](https://aur.archlinux.org/packages/vscodium-insiders-bin).
+
+If you want to save disk space by having VSCodium use the Electron system-wide, you also have [vscodium-electron](https://aur.archlinux.org/packages/vscodium-electron),
+maintained by [@m00nw4tch3r](https://aur.archlinux.org/account/m00nw4tch3r).
+
+An alternative package [vscodium-git](https://aur.archlinux.org/packages/vscodium-git/), maintained by [@cedricroijakkers](https://github.com/cedricroijakkers), is also available should you wish to compile from source yourself.
 
 #### <a id="flatpak"></a>Flatpak Option (GNU/Linux)
 
-VSCodium is (unofficially) available as a Flatpak app [here](https://flathub.org/apps/details/com.vscodium.codium) and the build repo is [here](https://github.com/flathub/com.vscodium.codium). If your distribution has support for [flatpak](https://flathub.org), and you have enabled the [flathub repo](https://flatpak.org/setup/):
+VSCodium is available as a Flatpak app [here](https://flathub.org/apps/details/com.vscodium.codium) and the build repo is [here](https://github.com/flathub/com.vscodium.codium).
+If your distribution has support for [flatpak](https://flathub.org), and you have enabled the [flathub repo](https://flatpak.org/setup/):
+
 ```bash
 flatpak install flathub com.vscodium.codium
-
 flatpak run com.vscodium.codium
 ```
 
 ## <a id="build"></a>Build
 
-Build instructions can be found [here](https://github.com/VSCodium/vscodium/blob/master/docs/build.md)
+Build instructions can be found [here](https://github.com/VSCodium/vscodium/blob/master/docs/howto-build.md)
 
 ## <a id="why"></a>Why Does This Exist
 
@@ -131,13 +160,17 @@ Microsoft's build process (which we are running to build the binaries) does down
 
 ### Documentation
 
-For more information on getting all the telemetry disabled and tips for migrating from Visual Studio Code to VSCodium, have a look at this [Docs](https://github.com/VSCodium/vscodium/blob/master/DOCS.md) page.
+For more information on getting all the telemetry disabled, tips for migrating from Visual Studio Code to VSCodium and more, have a look at [the Docs page](https://github.com/VSCodium/vscodium/blob/master/docs/index.md) page.
+
+### Troubleshooting
+
+If you have any issue, please check [the Troubleshooting page](https://github.com/VSCodium/vscodium/blob/master/docs/troubleshooting.md) or the existing issues.
 
 ### Extensions and the Marketplace
 
-According to the VS Code Marketplace [Terms of Use](https://aka.ms/vsmarketplace-ToU), _you may only install and use Marketplace Offerings with Visual Studio Products and Services._ For this reason, VSCodium uses [open-vsx.org](https://open-vsx.org/), an open source registry for VS Code extensions. See the [Extensions + Marketplace](https://github.com/VSCodium/vscodium/blob/master/DOCS.md#extensions-marketplace) section on the Docs page for more details.
+According to the VS Code Marketplace [Terms of Use](https://aka.ms/vsmarketplace-ToU), _you may only install and use Marketplace Offerings with Visual Studio Products and Services._ For this reason, VSCodium uses [open-vsx.org](https://open-vsx.org/), an open source registry for VS Code extensions. See the [Extensions + Marketplace](https://github.com/VSCodium/vscodium/blob/master/docs/index.md#extensions-marketplace) section on the Docs page for more details.
 
-Please note that some Visual Studio Code extensions have licenses that restrict their use to the official Visual Studio Code builds and therefore do not work with VSCodium. See [this note](https://github.com/VSCodium/vscodium/blob/master/DOCS.md#proprietary-debugging-tools) on the Docs page for what's been found so far and possible workarounds.
+Please note that some Visual Studio Code extensions have licenses that restrict their use to the official Visual Studio Code builds and therefore do not work with VSCodium. See [this note](https://github.com/VSCodium/vscodium/blob/master/docs/index.md#proprietary-debugging-tools) on the Docs page for what's been found so far and possible workarounds.
 
 ### How are the VSCodium binaries built?
 
@@ -148,22 +181,19 @@ The builds are run every day, but exit early if there isn't a new release from M
 ## <a id="supported-platforms"></a>Supported Platforms
 
 The minimal version is limited by the core component Electron, you may want to check its [platform prerequisites](https://www.electronjs.org/docs/latest/development/build-instructions-gn#platform-prerequisites).
-- [x] macOS (`zip`, `dmg`) OS X 10.10 or newer x64
+
+- [x] macOS (`zip`, `dmg`) macOS 10.15 or newer x64
 - [x] macOS (`zip`, `dmg`) macOS 11.0 or newer arm64
-- [x] GNU/Linux x64 (`deb`, `rpm`, `AppImage`, `tar.gz`)
-- [x] GNU/Linux x86 (`deb`, `rpm`, `tar.gz`) ([up to v1.35.1](https://code.visualstudio.com/updates/v1_36#_linux-32bit-support-ends))
-- [x] GNU/Linux arm64 (`deb`, `tar.gz`)
-- [x] GNU/Linux armhf (`deb`, `tar.gz`)
+- [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 x86
 - [x] Windows 10 / Server 2012 R2 or newer arm64
 
-
-## <a id="donate"></a>Donate
-
-If you would like to support the development of VSCodium, feel free to send BTC to `3PgjE95yzBDTrSPxPiqoxSgZFuKPPAix1N`.
-
-Special thanks to:
+## <a id="thanks"></a>Special thanks
 
 <table>
   <tr>
@@ -178,6 +208,14 @@ Special thanks to:
     <td><a href="https://www.macstadium.com" target="_blank"><img src="https://images.prismic.io/macstadium/66fbce64-707e-41f3-b547-241908884716_MacStadium_Logo.png?w=128&q=75" width="128" height="49" alt="MacStadium logo" /></a></td>
     <td>for providing a Mac mini M1</td>
   </tr>
+  <tr>
+    <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,2 +1,7 @@
 [
+  {
+    "id": "#1227",
+    "title": "Issue(macOS): manual update to `1.90.x`",
+    "url": "https://github.com/VSCodium/vscodium/issues/1917"
+  }
 ]

build.sh

@@ -3,10 +3,6 @@
 
 set -ex
 
-if [[ -f  "./remote-dependencies.tar" ]]; then
-  tar -xf ./remote-dependencies.tar ./vscode/remote/node_modules
-fi
-
 . version.sh
 
 if [[ "${SHOULD_BUILD}" == "yes" ]]; then
@@ -16,6 +12,8 @@ if [[ "${SHOULD_BUILD}" == "yes" ]]; then
 
   cd vscode || { echo "'vscode' dir not found"; exit 1; }
 
+  export NODE_OPTIONS="--max-old-space-size=8192"
+
   yarn monaco-compile-check
   yarn valid-layers-check
 
@@ -31,21 +29,29 @@ if [[ "${SHOULD_BUILD}" == "yes" ]]; then
 
     VSCODE_PLATFORM="darwin"
   elif [[ "${OS_NAME}" == "windows" ]]; then
-    . ../build/windows/rtf/make.sh
+    # generate Group Policy definitions
+    node build/lib/policies
 
-    yarn gulp "vscode-win32-${VSCODE_ARCH}-min-ci"
+    # in CI, packaging will be done by a different job
+    if [[ "${CI_BUILD}" == "no" ]]; then
+      . ../build/windows/rtf/make.sh
 
-    if [[ "${VSCODE_ARCH}" != "ia32" && "${VSCODE_ARCH}" != "x64" ]]; then
-      SHOULD_BUILD_REH="no"
+      yarn gulp "vscode-win32-${VSCODE_ARCH}-min-ci"
+
+      if [[ "${VSCODE_ARCH}" != "x64" ]]; then
+        SHOULD_BUILD_REH="no"
+        SHOULD_BUILD_REH_WEB="no"
+      fi
     fi
 
     VSCODE_PLATFORM="win32"
-  elif [[ "${VSCODE_ARCH}" == "ppc64le" ]]; then # linux-ppc64le
-    VSCODE_PLATFORM="linux"
   else # linux
-    yarn gulp "vscode-linux-${VSCODE_ARCH}-min-ci"
+    # in CI, packaging will be done by a different job
+    if [[ "${CI_BUILD}" == "no" ]]; then
+      yarn gulp "vscode-linux-${VSCODE_ARCH}-min-ci"
 
-    find "../VSCode-linux-${VSCODE_ARCH}" -print0 | xargs -0 touch -c
+      find "../VSCode-linux-${VSCODE_ARCH}" -print0 | xargs -0 touch -c
+    fi
 
     VSCODE_PLATFORM="linux"
   fi
@@ -55,5 +61,10 @@ if [[ "${SHOULD_BUILD}" == "yes" ]]; then
     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/alpine/package_reh.sh

@@ -0,0 +1,98 @@
+#!/usr/bin/env bash
+# shellcheck disable=SC1091
+
+set -ex
+
+if [[ "${CI_BUILD}" == "no" ]]; then
+  exit 1
+fi
+
+# include common functions
+. ./utils.sh
+
+mkdir -p assets
+
+tar -xzf ./vscode.tar.gz
+
+cd vscode || { echo "'vscode' dir not found"; exit 1; }
+
+export VSCODE_PLATFORM='alpine'
+export VSCODE_SKIP_NODE_VERSION_CHECK=1
+
+VSCODE_HOST_MOUNT="$( pwd )"
+VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:alpine-${VSCODE_ARCH}"
+
+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
+      apply_patch "${file}"
+    fi
+  done
+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
+
+if [[ "${VSCODE_ARCH}" == "x64" ]]; then
+  PA_NAME="linux-alpine"
+else
+  PA_NAME="alpine-arm64"
+fi
+
+if [[ "${SHOULD_BUILD_REH}" != "no" ]]; then
+  echo "Building REH"
+  yarn gulp minify-vscode-reh
+  yarn gulp "vscode-reh-${PA_NAME}-min-ci"
+
+  pushd "../vscode-reh-${PA_NAME}"
+
+  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-${PA_NAME}-min-ci"
+
+  pushd "../vscode-reh-web-${PA_NAME}"
+
+  echo "Archiving REH-web"
+  tar czf "../assets/${APP_NAME_LC}-reh-web-${VSCODE_PLATFORM}-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" .
+
+  popd
+fi
+
+cd ..
+
+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 ..

build/azure-pipelines/computeYarnCacheKey.js

@@ -1,24 +0,0 @@
-const fs = require("fs");
-const crypto = require("crypto");
-const path = require("path");
-const { dirs } = require('../../vscode/build/npm/dirs');
-
-const ROOT = path.join(__dirname, '../../vscode');
-
-const shasum = crypto.createHash('sha1');
-
-shasum.update(fs.readFileSync(path.join(ROOT, '.yarnrc')));
-shasum.update(fs.readFileSync(path.join(ROOT, 'remote/.yarnrc')));
-
-// Add `yarn.lock` files
-for (let dir of dirs) {
-    const yarnLockPath = path.join(ROOT, dir, 'yarn.lock');
-    shasum.update(fs.readFileSync(yarnLockPath));
-}
-
-// Add any other command line arguments
-for (let i = 2; i < process.argv.length; i++) {
-    shasum.update(process.argv[i]);
-}
-
-process.stdout.write(shasum.digest('hex'));

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/linux/loong64/electron.sh

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

build/linux/loong64/electron.sha256sums

@@ -0,0 +1,11 @@
+e47103e4191b781c9a166ec07f310b1d615866022fc896adf959f81a91615d33 *chromedriver-v34.2.0-linux-loong64.zip
+24ac8b4c6dae1e3bc31de1cda733176ac03b0a124788fe2000a07723c17aa3ad *electron-v34.2.0-linux-loong64-debug.zip
+0a2330d8aa615aa2faac3fc6d3d1924784cab9a1b9a498e00210cf90adc3e98a *electron-v34.2.0-linux-loong64-symbols.zip
+97687006d23a57ee35fc3d3ce8803dfb7e48538ccaf98a73fc8eef09afc35672 *electron-v34.2.0-linux-loong64.zip
+88f1d2e434c111203f06e17a5a23fe8ba5ea572473559055064784e37b804bb9 *hunspell-dictionaries.zip
+b085b7ae8b77b07a210026901816f440c841666222809af3ae9aaf16d95ee6a2 *libcxx-headers.zip
+1f8b7234dd1a8c219909aae8c8c4b5c064c7eb60b9b30efb2207b16a0991acfc *libcxx-objects-v34.2.0-linux-loong64.zip
+a34caad87f177ae6b6098fef84a832fb0887bd5819be9cdc1272d317f4036b96 *libcxxabi-headers.zip
+b7ea74bf6d6aac7eb96841c0c7539f5c8b853e715c4b4396c6cd097a872303b3 *mksnapshot-v34.2.0-linux-loong64.zip
+2e574c7bf182ae8dfdb302be68da8c5d783cd952391e61e166bd8069dc8752fc *node-v34.2.0-headers.tar.gz
+

build/linux/loong64/ripgrep.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}"

build/linux/package_bin.sh

@@ -0,0 +1,140 @@
+#!/usr/bin/env bash
+# shellcheck disable=SC1091
+
+set -ex
+
+if [[ "${CI_BUILD}" == "no" ]]; then
+  exit 1
+fi
+
+# include common functions
+. ./utils.sh
+
+tar -xzf ./vscode.tar.gz
+
+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 [[ "${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 "../build/linux/${VSCODE_ARCH}/electron.sh" ]]; then
+  # add newline at the end of the file
+  echo "" >> build/checksums/electron.txt
+
+  if [[ -f "../build/linux/${VSCODE_ARCH}/electron.sha256sums" ]]; then
+    cat "../build/linux/${VSCODE_ARCH}/electron.sha256sums" >> build/checksums/electron.txt
+  fi
+
+  # shellcheck disable=SC1090
+  source "../build/linux/${VSCODE_ARCH}/electron.sh"
+
+  TARGET=$( yarn config get target )
+
+  # Only fails at different major versions
+  if [[ "${ELECTRON_VERSION%%.*}" != "${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
+
+  if [[ "${ELECTRON_VERSION}" != "${TARGET}" ]]; then
+    # Force version
+    replace "s|target=\"${TARGET}\"|target=\"${ELECTRON_VERSION}\"|" .npmrc
+  fi
+fi
+
+if [[ -d "../patches/linux/client/" ]]; then
+  for file in "../patches/linux/client/"*.patch; do
+    if [[ -f "${file}" ]]; then
+      apply_patch "${file}"
+    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
+  npm ci --prefix build && break
+  if [[ $i == 3 ]]; then
+    echo "Npm install failed too many times" >&2
+    exit 1
+  fi
+  echo "Npm install failed $i, trying again..."
+done
+
+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 -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
+
+yarn gulp "vscode-linux-${VSCODE_ARCH}-min-ci"
+
+if [[ -f "../build/linux/${VSCODE_ARCH}/ripgrep.sh" ]]; then
+  bash "../build/linux/${VSCODE_ARCH}/ripgrep.sh" "../VSCode-linux-${VSCODE_ARCH}/resources/app/node_modules"
+fi
+
+find "../VSCode-linux-${VSCODE_ARCH}" -print0 | xargs -0 touch -c
+
+cd ..

build/linux/package_reh.sh

@@ -0,0 +1,223 @@
+#!/usr/bin/env bash
+# shellcheck disable=SC1091
+
+set -ex
+
+if [[ "${CI_BUILD}" == "no" ]]; then
+  exit 1
+fi
+
+# include common functions
+. ./utils.sh
+
+mkdir -p assets
+
+tar -xzf ./vscode.tar.gz
+
+cd vscode || { echo "'vscode' dir not found"; exit 1; }
+
+GLIBC_VERSION="2.28"
+GLIBCXX_VERSION="3.4.26"
+NODE_VERSION="20.18.2"
+
+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:focal-devtoolset-x64"
+
+  export VSCODE_NODEJS_SITE='https://unofficial-builds.nodejs.org'
+  export VSCODE_NODEJS_URLSUFFIX='-glibc-217'
+
+  export VSCODE_SKIP_SETUPENV=1
+elif [[ "${VSCODE_ARCH}" == "arm64" ]]; then
+  EXPECTED_GLIBC_VERSION="2.30"
+
+  VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:focal-devtoolset-arm64"
+
+  export VSCODE_SKIP_SYSROOT=1
+  export USE_GNUPP2A=1
+elif [[ "${VSCODE_ARCH}" == "armhf" ]]; then
+  EXPECTED_GLIBC_VERSION="2.30"
+
+  VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:focal-devtoolset-armhf"
+
+  export VSCODE_SKIP_SYSROOT=1
+  export USE_GNUPP2A=1
+elif [[ "${VSCODE_ARCH}" == "ppc64le" ]]; then
+  VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:focal-devtoolset-ppc64le"
+
+  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 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:beige-devtoolset-loong64"
+
+  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 VSCODE_SYSROOT_REPOSITORY='VSCodium/vscode-linux-build-agent'
+  export VSCODE_SYSROOT_VERSION='20241108'
+fi
+
+export ELECTRON_SKIP_BINARY_DOWNLOAD=1
+export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
+export VSCODE_PLATFORM='linux'
+export VSCODE_SKIP_NODE_VERSION_CHECK=1
+export VSCODE_SYSROOT_PREFIX="-glibc-${GLIBC_VERSION}"
+
+EXPECTED_GLIBC_VERSION="${EXPECTED_GLIBC_VERSION:=GLIBC_VERSION}"
+VSCODE_HOST_MOUNT="$( pwd )"
+
+export VSCODE_HOST_MOUNT
+export VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME
+
+sed -i "/target/s/\"20.*\"/\"${NODE_VERSION}\"/" remote/.npmrc
+
+if [[ -d "../patches/linux/reh/" ]]; then
+  for file in "../patches/linux/reh/"*.patch; do
+    if [[ -f "${file}" ]]; then
+      apply_patch "${file}"
+    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
+      apply_patch "${file}"
+    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
+
+mv .npmrc .npmrc.bak
+cp ../npmrc .npmrc
+
+for i in {1..5}; do # try 5 times
+  npm ci --prefix build && break
+  if [[ $i == 3 ]]; then
+    echo "Npm install failed too many times" >&2
+    exit 1
+  fi
+  echo "Npm install failed $i, trying again..."
+done
+
+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..."
+
+  # remove dependencies that fail during cleanup
+  rm -rf node_modules/@vscode node_modules/node-pty
+done
+
+mv .npmrc.bak .npmrc
+
+node build/azure-pipelines/distro/mixin-npm
+
+export VSCODE_NODE_GLIBC="-glibc-${GLIBC_VERSION}"
+
+if [[ "${SHOULD_BUILD_REH}" != "no" ]]; then
+  echo "Building REH"
+  yarn gulp minify-vscode-reh
+  yarn gulp "vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}-min-ci"
+
+  EXPECTED_GLIBC_VERSION="${EXPECTED_GLIBC_VERSION}" EXPECTED_GLIBCXX_VERSION="${GLIBCXX_VERSION}" SEARCH_PATH="../vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}" ./build/azure-pipelines/linux/verify-glibc-requirements.sh
+
+  pushd "../vscode-reh-${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"
+  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="${EXPECTED_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
+
+cd ..
+
+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 ..

build/linux/ppc64le/electron.sh

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

build/linux/ppc64le/electron.sha256sums

@@ -0,0 +1,11 @@
+e28d3ffb1a4cdcef80b93cf2a73214c4a85b2fc2a414aefc14a03b212ce07a28 *chromedriver-v34.2.0-linux-ppc64le.zip
+4cfaa3e888b9d4acb9149ca521188dc2e945fa569230b026d5a74d8a85a6f8ce *electron-v34.2.0-linux-ppc64le-debug.zip
+3a82c9ef68f60234ea6d506205d3f37fc7821f7f2a9217c1f9027078da1b3a44 *electron-v34.2.0-linux-ppc64le-symbols.zip
+85d2ddaee9d5aa93ab341e3a6f9ac2b7fce3825efee7b885cdda7ad91244a158 *electron-v34.2.0-linux-ppc64le.zip
+5ca44a4ee9cc74a56c9556ce3f3774986dbb8b4f4953088c7f4577bfba4356a8 *electron.d.ts
+a5db064d9f82e2ad8be677d5c5bcf4e9bca68b38ca1e096c54029879098bf7ba *ffmpeg-v34.2.0-linux-ppc64le.zip
+d19ee157a394a258c0d2820ca0b3d6f3403065c54bdb4b35d8227c844ebc18d9 *hunspell_dictionaries.zip
+3ba2b632a70b16315c0f975a87ebaf47b24878396d4e5b7ba1d9db49eb1bfee9 *libcxx-objects-v34.2.0-linux-ppc64le.zip
+552fe6a9afe66b9efa054856553bb88c35ccafa31bc3bb398b483d77291be12c *libcxx_headers.zip
+71d695f56d7fbee44d18d503790951c17ba22f2f75c5b96131d4c65e865860f0 *libcxxabi_headers.zip
+6e25a04c8e19e475edbc8b7145df84372b0e8abdcde3c9ea42b5aaa6fb69ccda *mksnapshot-v34.2.0-linux-ppc64le.zip

build/linux/riscv64/electron.sh

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

build/linux/riscv64/electron.sha256sums

@@ -0,0 +1,11 @@
+1cbe2e0aa7ce41832781b867ab1899bd83bbebf37ea89036e2d1f2e4e8c231dd *chromedriver-v34.2.0-linux-riscv64.zip
+2a6dc0241a8f62e442833e8a6438b150206d824874b3c42d41220052ce2558d2 *electron-v34.2.0-linux-riscv64-debug.tar.zst
+54c6f5a7775ca09b7c61c89ce668d68bcbd3bf9d0f88bcebbfc93d68fcf53ca9 *electron-v34.2.0-linux-riscv64-symbols.tar.zst
+edc0e2b28a05eb4c812c09c072b091df1d90a74283ad58ac7b61c6c538048882 *electron-v34.2.0-linux-riscv64.zip
+e9a934eb94580f5ff18537a9afab8eac59f21784e07952c0511fe8db3e0b63a1 *ffmpeg-v34.2.0-linux-riscv64.zip
+0e162c2636b9583d39b40a383ee4ea41f177c82b20d168ec869a625a6f7a6f6b *hunspell-dictionaries.zip
+d12dfd2413e0151c8ba800b0fa8881d2910b49793e62576798c3358eef724eec *libcxx-headers.zip
+b2befbd4a5149b6f63925f833fcb40c247b5205e90a80426d6ba87e48e259575 *libcxx-objects-v34.2.0-linux-riscv64.zip
+f70f8fdea628beac7c90453f4f4c01a587c5e0c5f6cd12bcbba6019fe6c172f9 *libcxxabi-headers.zip
+ea85918270250a56ec1217d7c79ae8f0d8f1b8bd3e21c3f80e68e3b3fca20fbb *mksnapshot-v34.2.0-linux-riscv64.zip
+25ca4f68090ac1474d7306ca74fb64a57501216fd25aeeca7795c058f8124f57 *node-v34.2.0-headers.tar.gz

build/linux/riscv64/ripgrep.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}"

build/osx/include.gypi

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

build/update_patches.sh

@@ -1,60 +0,0 @@
-#!/usr/bin/env bash
-
-export VSCODE_QUALITY="stable"
-
-while getopts ":i" opt; do
-  case "$opt" in
-    i)
-      export VSCODE_QUALITY="insider"
-      ;;
-    *)
-      ;;
-  esac
-done
-
-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
-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
-  done
-fi

build/windows/msi/i18n/vscodium.en-us.wxl

@@ -13,9 +13,9 @@
   <String Id="FeatureFileTypeAssociationsTitle">File Associations</String>
   <String Id="FeatureFileTypeAssociationsDescription">Register @@PRODUCT_NAME@@ as an editor for supported file types.</String>
   <String Id="FeatureAddContextMenuFilesTitle">Files context menu</String>
-  <String Id="FeatureAddContextMenuFilesDescription">Add "Open with @@PRODUCT_NAME@@" action to Windows Explorer file contect menu.</String>
+  <String Id="FeatureAddContextMenuFilesDescription">Add "Open with @@PRODUCT_NAME@@" action to Windows Explorer file context menu.</String>
   <String Id="FeatureAddContextMenuFoldersTitle">Directory context menu</String>
-  <String Id="FeatureAddContextMenuFoldersDescription">Add "Open with @@PRODUCT_NAME@@" action to Windows Explorer directory contect menu.</String>
+  <String Id="FeatureAddContextMenuFoldersDescription">Add "Open with @@PRODUCT_NAME@@" action to Windows Explorer directory context menu.</String>
   <String Id="FeatureEnvironmentTitle">Add to PATH</String>
   <String Id="FeatureEnvironmentDescription">Add @@PRODUCT_NAME@@ to PATH environment variable. Available after restart.</String>
   <String Id="LaunchApplication">Launch @@PRODUCT_NAME@@</String>

build/windows/package.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 ..

check_cron_or_pr.sh

@@ -6,7 +6,7 @@ set -e
 if [[ "${GITHUB_EVENT_NAME}" == "pull_request" ]]; then
 	echo "It's a PR"
 
-	export SHOULD_BUILD="yes"
+  export SHOULD_BUILD="yes"
 	export SHOULD_DEPLOY="no"
 elif [[ "${GITHUB_EVENT_NAME}" == "push" ]]; then
 	echo "It's a Push"
@@ -14,8 +14,8 @@ elif [[ "${GITHUB_EVENT_NAME}" == "push" ]]; then
 	export SHOULD_BUILD="yes"
 	export SHOULD_DEPLOY="no"
 elif [[ "${GITHUB_EVENT_NAME}" == "workflow_dispatch" ]]; then
-  if [[ "${TEST_ASSET_BUILDER}" == "true" ]]; then
-    echo "It's testing the assets builder"
+  if [[ "${GENERATE_ASSETS}" == "true" ]]; then
+    echo "It will generate the assets"
 
     export SHOULD_BUILD="yes"
     export SHOULD_DEPLOY="no"

check_tags.sh

@@ -3,42 +3,60 @@
 
 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)}' )"
-GITHUB_RESPONSE=$( curl -s -H "Authorization: token ${GITHUB_TOKEN}" "https://api.github.com/repos/${ASSETS_REPOSITORY}/releases/latest" )
-LATEST_VERSION=$( echo "${GITHUB_RESPONSE}" | jq -c -r '.tag_name' )
 
-if [[ "${LATEST_VERSION}" =~ ^([0-9]+\.[0-9]+\.[0-9]+) ]]; then
-  if [[ "${MS_TAG}" != "${BASH_REMATCH[1]}" ]]; then
-    echo "New VSCode version, new build"
-    export SHOULD_BUILD="yes"
-  elif [[ "${NEW_RELEASE}" == "true" ]]; then
-    echo "New release build"
-    export SHOULD_BUILD="yes"
-  elif [[ "${VSCODE_QUALITY}" == "insider" ]]; then
-    BODY=$( echo "${GITHUB_RESPONSE}" | jq -c -r '.body' )
+if [[ "${SHOULD_DEPLOY}" == "no" ]]; then
+  ASSETS="null"
+else
+  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}"
 
-    if [[ "${BODY}" =~ \[([a-z0-9]+)\] ]]; then
-      if [[ "${MS_COMMIT}" != "${BASH_REMATCH[1]}" ]]; then
-        echo "New VSCode Insiders version, new build"
-        export SHOULD_BUILD="yes"
+  if [[ "${LATEST_VERSION}" =~ ^([0-9]+\.[0-9]+\.[0-9]+) ]]; then
+    if [[ "${MS_TAG}" != "${BASH_REMATCH[1]}" ]]; then
+      echo "New VSCode version, new build"
+      export SHOULD_BUILD="yes"
+    elif [[ "${NEW_RELEASE}" == "true" ]]; then
+      echo "New release build"
+      export SHOULD_BUILD="yes"
+    elif [[ "${VSCODE_QUALITY}" == "insider" ]]; then
+      BODY=$( echo "${GITHUB_RESPONSE}" | jq -c -r '.body' )
+
+      if [[ "${BODY}" =~ \[([a-z0-9]+)\] ]]; then
+        if [[ "${MS_COMMIT}" != "${BASH_REMATCH[1]}" ]]; then
+          echo "New VSCode Insiders version, new build"
+          export SHOULD_BUILD="yes"
+        fi
       fi
     fi
-  fi
 
-  if [[ "${SHOULD_BUILD}" != "yes" ]]; then
-    export RELEASE_VERSION="${LATEST_VERSION}"
-    echo "RELEASE_VERSION=${RELEASE_VERSION}" >> "${GITHUB_ENV}"
+    if [[ "${SHOULD_BUILD}" != "yes" ]]; then
+      export RELEASE_VERSION="${LATEST_VERSION}"
+      echo "RELEASE_VERSION=${RELEASE_VERSION}" >> "${GITHUB_ENV}"
 
-    echo "Switch to release version: ${RELEASE_VERSION}"
+      echo "Switch to release version: ${RELEASE_VERSION}"
 
-    ASSETS=$( echo "${GITHUB_RESPONSE}" | jq -c '.assets | map(.name)?' )
+      ASSETS=$( echo "${GITHUB_RESPONSE}" | jq -c '.assets | map(.name)?' )
+    elif [[ "${RECHECK_ASSETS}" == "yes" ]]; then
+      export SHOULD_BUILD="no"
+
+      ASSETS=$( echo "${GITHUB_RESPONSE}" | jq -c '.assets | map(.name)?' )
+    else
+      ASSETS="null"
+    fi
   else
-    ASSETS="null"
+    echo "can't check assets"
+    exit 1
   fi
 fi
 
@@ -47,17 +65,18 @@ contains() {
   echo "${ASSETS}" | grep "${1}\""
 }
 
-if [[ "${ASSETS}" != "null" ]]; then
-  # macos
-  if [[ "${OS_NAME}" == "osx" ]]; then
-    if [[ "${VSCODE_ARCH}" == "arm64" ]]; then
-      if [[ -z $( contains "${APP_NAME}-${RELEASE_VERSION}-src.tar.gz" ) || -z $( contains "${APP_NAME}-${RELEASE_VERSION}-src.zip" ) ]]; then
-        echo "Building on MacOS because we have no SRC"
-        export SHOULD_BUILD="yes"
-        export SHOULD_BUILD_SRC="yes"
-      fi
+# shellcheck disable=SC2153
+if [[ "${CHECK_ASSETS}" == "no" ]]; then
+  echo "Don't check assets, yet"
+elif [[ "${ASSETS}" != "null" ]]; then
+  if [[ "${IS_SPEARHEAD}" == "yes" ]]; then
+    if [[ -z $( contains "${APP_NAME}-${RELEASE_VERSION}-src.tar.gz" ) || -z $( contains "${APP_NAME}-${RELEASE_VERSION}-src.zip" ) ]]; then
+      echo "Building because we have no SRC"
+      export SHOULD_BUILD="yes"
+      export SHOULD_BUILD_SRC="yes"
     fi
-
+  # macos
+  elif [[ "${OS_NAME}" == "osx" ]]; then
     if [[ -z $( contains "${APP_NAME}-darwin-${VSCODE_ARCH}-${RELEASE_VERSION}.zip" ) ]]; then
       echo "Building on MacOS because we have no ZIP"
       export SHOULD_BUILD="yes"
@@ -79,6 +98,13 @@ if [[ "${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
@@ -108,6 +134,7 @@ if [[ "${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"
@@ -136,14 +163,18 @@ if [[ "${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
@@ -157,6 +188,13 @@ if [[ "${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
@@ -184,14 +222,18 @@ if [[ "${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
@@ -205,161 +247,399 @@ if [[ "${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
     fi
-  elif [[ "${OS_NAME}" == "linux" ]]; then
+  else
+    if [[ "${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"
+        else
+          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
 
-    # linux-arm64
-    if [[ "${VSCODE_ARCH}" == "arm64" ]]; then
-      if [[ -z $( contains "arm64.deb" ) ]]; then
-        echo "Building on Linux arm64 because we have no DEB"
-        export SHOULD_BUILD="yes"
       else
-        export SHOULD_BUILD_DEB="no"
-      fi
 
-      if [[ -z $( contains "aarch64.rpm" ) ]]; then
-        echo "Building on Linux arm64 because we have no RPM"
-        export SHOULD_BUILD="yes"
+        # linux-arm64
+        if [[ "${VSCODE_ARCH}" == "arm64" || "${CHECK_ALL}" == "yes" ]]; then
+          if [[ -z $( contains "arm64.deb" ) ]]; then
+            echo "Building on Linux arm64 because we have no DEB"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_DEB="no"
+          fi
+
+          if [[ -z $( contains "aarch64.rpm" ) ]]; then
+            echo "Building on Linux arm64 because we have no RPM"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_RPM="no"
+          fi
+
+          if [[ -z $( contains "${APP_NAME}-linux-arm64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux arm64 because we have no TAR"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_TAR="no"
+          fi
+
+          if [[ -z $( contains "arm64.snap" ) ]]; then
+            echo "Building on Linux arm64 because we have no SNAP"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_SNAP="no"
+          fi
+
+          if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-linux-arm64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux 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-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
+            echo "Already have all the Linux arm64 builds"
+          fi
+        fi
+
+        # linux-armhf
+        if [[ "${VSCODE_ARCH}" == "armhf" || "${CHECK_ALL}" == "yes" ]]; then
+          if [[ -z $( contains "armhf.deb" ) ]]; then
+            echo "Building on Linux arm because we have no DEB"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_DEB="no"
+          fi
+
+          if [[ -z $( contains "armv7hl.rpm" ) ]]; then
+            echo "Building on Linux arm because we have no RPM"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_RPM="no"
+          fi
+
+          if [[ -z $( contains "${APP_NAME}-linux-armhf-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux arm because we have no TAR"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_TAR="no"
+          fi
+
+          if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-linux-armhf-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux arm 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-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
+            echo "Already have all the Linux arm builds"
+          fi
+        fi
+
+        # linux-ppc64le
+        if [[ "${VSCODE_ARCH}" == "ppc64le" || "${CHECK_ALL}" == "yes" ]]; then
+          SHOULD_BUILD_APPIMAGE="no"
+          SHOULD_BUILD_DEB="no"
+          SHOULD_BUILD_RPM="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 [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-linux-ppc64le-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux PowerPC64LE 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-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
+        fi
+
+        # linux-riscv64
+        if [[ "${VSCODE_ARCH}" == "riscv64" || "${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-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 [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-linux-riscv64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            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 [[ "${CHECK_REH}" != "no" && -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 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 [[ "${CHECK_REH}" != "no" && -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 [[ "${CHECK_REH}" != "no" && -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
+
+        # linux-x64
+        if [[ "${VSCODE_ARCH}" == "x64" || "${CHECK_ALL}" == "yes" ]]; then
+          if [[ -z $( contains "amd64.deb" ) ]]; then
+            echo "Building on Linux x64 because we have no DEB"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_DEB="no"
+          fi
+
+          if [[ -z $( contains "x86_64.rpm" ) ]]; then
+            echo "Building on Linux x64 because we have no RPM"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_RPM="no"
+          fi
+
+          if [[ -z $( contains "${APP_NAME}-linux-x64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux x64 because we have no TAR"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_TAR="no"
+          fi
+
+          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
+            export SHOULD_BUILD_APPIMAGE="no"
+          fi
+
+          if [[ -z $( contains "amd64.snap" ) ]]; then
+            echo "Building on Linux x64 because we have no SNAP"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_SNAP="no"
+          fi
+
+          if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-linux-x64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux 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-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
+    fi
+
+    if [[ "${OS_NAME}" == "alpine" ]] || [[ "${OS_NAME}" == "linux" && "${CHECK_ALL}" == "yes" ]]; 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
-        export SHOULD_BUILD_RPM="no"
-      fi
 
-      if [[ -z $( contains "${APP_NAME}-linux-arm64-${RELEASE_VERSION}.tar.gz" ) ]]; then
-        echo "Building on Linux arm64 because we have no TAR"
-        export SHOULD_BUILD="yes"
-      else
-        export SHOULD_BUILD_TAR="no"
-      fi
+        # 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 [[ -z $( contains "${APP_NAME_LC}-reh-linux-arm64-${RELEASE_VERSION}.tar.gz" ) ]]; then
-        echo "Building on Linux 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
 
-      export SHOULD_BUILD_APPIMAGE="no"
+        # 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 [[ "${SHOULD_BUILD}" != "yes" ]]; then
-        echo "Already have all the Linux arm64 builds"
-      fi
-
-    # linux-armhf
-    elif [[ "${VSCODE_ARCH}" == "armhf" ]]; then
-      if [[ -z $( contains "armhf.deb" ) ]]; then
-        echo "Building on Linux arm because we have no DEB"
-        export SHOULD_BUILD="yes"
-      else
-        export SHOULD_BUILD_DEB="no"
-      fi
-
-      if [[ -z $( contains "armv7hl.rpm" ) ]]; then
-        echo "Building on Linux arm because we have no RPM"
-        export SHOULD_BUILD="yes"
-      else
-        export SHOULD_BUILD_RPM="no"
-      fi
-
-      if [[ -z $( contains "${APP_NAME}-linux-armhf-${RELEASE_VERSION}.tar.gz" ) ]]; then
-        echo "Building on Linux arm because we have no TAR"
-        export SHOULD_BUILD="yes"
-      else
-        export SHOULD_BUILD_TAR="no"
-      fi
-
-      if [[ -z $( contains "${APP_NAME_LC}-reh-linux-armhf-${RELEASE_VERSION}.tar.gz" ) ]]; then
-        echo "Building on Linux arm because we have no REH archive"
-        export SHOULD_BUILD="yes"
-      else
-        export SHOULD_BUILD_REH="no"
-      fi
-
-      export SHOULD_BUILD_APPIMAGE="no"
-
-      if [[ "${SHOULD_BUILD}" != "yes" ]]; then
-        echo "Already have all the Linux arm builds"
-      fi
-
-    # linux-ppc64le
-    elif [[ "${VSCODE_ARCH}" == "ppc64le" ]]; then
-      SHOULD_BUILD_DEB="no"
-      SHOULD_BUILD_APPIMAGE="no"
-      SHOULD_BUILD_RPM="no"
-      SHOULD_BUILD_TAR="no"
-
-      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"
-        export SHOULD_BUILD="yes"
-      else
-        export SHOULD_BUILD_REH="no"
-      fi
-
-      if [[ "${SHOULD_BUILD}" != "yes" ]]; then
-        echo "Already have all the Linux PowerPC64LE builds"
-      fi
-
-    # linux-x64
-    else
-      if [[ -z $( contains "amd64.deb" ) ]]; then
-        echo "Building on Linux x64 because we have no DEB"
-        export SHOULD_BUILD="yes"
-      else
-        export SHOULD_BUILD_DEB="no"
-      fi
-
-      if [[ -z $( contains "x86_64.rpm" ) ]]; then
-        echo "Building on Linux x64 because we have no RPM"
-        export SHOULD_BUILD="yes"
-      else
-        export SHOULD_BUILD_RPM="no"
-      fi
-
-      if [[ -z $( contains "${APP_NAME}-linux-x64-${RELEASE_VERSION}.tar.gz" ) ]]; then
-        echo "Building on Linux x64 because we have no TAR"
-        export SHOULD_BUILD="yes"
-      else
-        export SHOULD_BUILD_TAR="no"
-      fi
-
-      if [[ -z $( contains "x86_64.AppImage" ) ]]; then
-        echo "Building on Linux x64 because we have no AppImage"
-        export SHOULD_BUILD="yes"
-      else
-        export SHOULD_BUILD_APPIMAGE="no"
-      fi
-
-      if [[ -z $( contains "${APP_NAME_LC}-reh-linux-x64-${RELEASE_VERSION}.tar.gz" ) ]]; then
-        echo "Building on Linux x64 because we have no REH archive"
-        export SHOULD_BUILD="yes"
-      else
-        export SHOULD_BUILD_REH="no"
-      fi
-
-      if [[ "${SHOULD_BUILD}" != "yes" ]]; then
-        echo "Already have all the Linux x64 builds"
+          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
   fi
 else
-  if [[ "${OS_NAME}" == "linux" ]]; then
+  if [[ "${IS_SPEARHEAD}" == "yes" ]]; then
+    export SHOULD_BUILD_SRC="yes"
+  elif [[ "${OS_NAME}" == "linux" ]]; then
     if [[ "${VSCODE_ARCH}" == "ppc64le" ]]; then
       SHOULD_BUILD_DEB="no"
-      SHOULD_BUILD_APPIMAGE="no"
       SHOULD_BUILD_RPM="no"
       SHOULD_BUILD_TAR="no"
-    elif [[ "${VSCODE_ARCH}" != "x64" ]]; then
-      export SHOULD_BUILD_APPIMAGE="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
-  elif [[ "${OS_NAME}" == "osx" ]]; then
-    if [[ "${VSCODE_ARCH}" == "arm64" ]]; then
-      export SHOULD_BUILD_SRC="yes"
+    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
 
@@ -377,7 +657,9 @@ 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_SNAP=${SHOULD_BUILD_SNAP}" >> "${GITHUB_ENV}"
 echo "SHOULD_BUILD_TAR=${SHOULD_BUILD_TAR}" >> "${GITHUB_ENV}"
 echo "SHOULD_BUILD_ZIP=${SHOULD_BUILD_ZIP}" >> "${GITHUB_ENV}"
 echo "SHOULD_BUILD_SRC=${SHOULD_BUILD_SRC}" >> "${GITHUB_ENV}"

dev/build.ps1

@@ -3,4 +3,4 @@
 # first so `bash` is the one installed with `git`, avoid conflict with WSL
 $env:Path = "C:\Program Files\Git\bin;" + $env:Path
 
-bash ./build/build.sh
+bash ./dev/build.sh

dev/build.sh

@@ -2,21 +2,26 @@
 # shellcheck disable=SC1091,SC2129
 
 ### Windows
-# to run with Bash: "C:\Program Files\Git\bin\bash.exe" ./build/build.sh
+# to run with Bash: "C:\Program Files\Git\bin\bash.exe" ./dev/build.sh
 ###
 
 export APP_NAME="VSCodium"
+export BINARY_NAME="codium"
 export CI_BUILD="no"
+export GH_REPO_PATH="VSCodium/vscodium"
+export ORG_NAME="VSCodium"
 export SHOULD_BUILD="yes"
 export SKIP_ASSETS="yes"
 export SKIP_BUILD="no"
 export SKIP_SOURCE="no"
 export VSCODE_LATEST="no"
 export VSCODE_QUALITY="stable"
+export VSCODE_SKIP_NODE_VERSION_CHECK="yes"
 
 while getopts ":ilops" opt; do
   case "$opt" in
     i)
+      export BINARY_NAME="codium-insiders"
       export VSCODE_QUALITY="insider"
       ;;
     l)
@@ -50,14 +55,22 @@ 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
 
+export NODE_OPTIONS="--max-old-space-size=8192"
+
 echo "OS_NAME=\"${OS_NAME}\""
 echo "SKIP_SOURCE=\"${SKIP_SOURCE}\""
 echo "SKIP_BUILD=\"${SKIP_BUILD}\""
@@ -73,16 +86,16 @@ if [[ "${SKIP_SOURCE}" == "no" ]]; then
   . version.sh
 
   # save variables for later
-  echo "MS_TAG=\"${MS_TAG}\"" > build.env
-  echo "MS_COMMIT=\"${MS_COMMIT}\"" >> build.env
-  echo "RELEASE_VERSION=\"${RELEASE_VERSION}\"" >> build.env
-  echo "BUILD_SOURCEVERSION=\"${BUILD_SOURCEVERSION}\"" >> build.env
+  echo "MS_TAG=\"${MS_TAG}\"" > dev/build.env
+  echo "MS_COMMIT=\"${MS_COMMIT}\"" >> dev/build.env
+  echo "RELEASE_VERSION=\"${RELEASE_VERSION}\"" >> dev/build.env
+  echo "BUILD_SOURCEVERSION=\"${BUILD_SOURCEVERSION}\"" >> dev/build.env
 else
   if [[ "${SKIP_ASSETS}" != "no" ]]; then
-    rm -rf VSCode*
+    rm -rf vscode-* VSCode-*
   fi
 
-  . build.env
+  . dev/build.env
 
   echo "MS_TAG=\"${MS_TAG}\""
   echo "MS_COMMIT=\"${MS_COMMIT}\""
@@ -97,14 +110,34 @@ 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 ./build/osx/include.gypi ~/.gyp/include.gypi
+  fi
+
   . build.sh
 
-  if [[ "${VSCODE_QUALITY}" == "insider" && "${VSCODE_LATEST}" == "yes" ]]; then
-    jsonTmp=$( jq --arg 'tag' "${MS_TAG/\-insider/}" --arg 'commit' "${MS_COMMIT}" '. "insider.json" | .tag=$tag | .commit=$commit' )
-    echo "${jsonTmp}" > "insider.json" && unset jsonTmp
+  if [[ -f "./include_${OS_NAME}.gypi" ]]; then
+    mv ~/.gyp/include.gypi.pre-vscodium ~/.gyp/include.gypi
+  fi
+
+  if [[ "${VSCODE_LATEST}" == "yes" ]]; then
+    jsonTmp=$( cat "./upstream/${VSCODE_QUALITY}.json" | jq --arg 'tag' "${MS_TAG/\-insider/}" --arg 'commit' "${MS_COMMIT}" '. | .tag=$tag | .commit=$commit' )
+    echo "${jsonTmp}" > "./upstream/${VSCODE_QUALITY}.json" && unset jsonTmp
   fi
 fi
 
@@ -113,5 +146,11 @@ if [[ "${SKIP_ASSETS}" == "no" ]]; then
     rm -rf build/windows/msi/releasedir
   fi
 
+  if [[ "${OS_NAME}" == "osx" && -f "dev/osx/codesign.env" ]]; then
+    . dev/osx/macos-codesign.env
+
+    echo "CERTIFICATE_OSX_ID: ${CERTIFICATE_OSX_ID}"
+  fi
+
   . prepare_assets.sh
 fi

dev/osx/codesign.env.template

@@ -0,0 +1,5 @@
+CERTIFICATE_OSX_APP_PASSWORD=
+CERTIFICATE_OSX_ID=
+CERTIFICATE_OSX_P12_DATA=
+CERTIFICATE_OSX_P12_PASSWORD=
+CERTIFICATE_OSX_TEAM_ID=

dev/patch.sh

@@ -1,29 +1,50 @@
 #!/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 --no-verify -q -m "VSCODIUM HELPER"
+
 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}"
+  git apply --reject "${FILE}" || true
 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}"
-
-cd ..
+git reset -q --hard HEAD~
 
 echo "The patch has been generated."

dev/update_api.sh

@@ -33,6 +33,7 @@ fi
 APIS=$( jq -r '.extensionEnabledApiProposals' "${DIRECTORY}/resources/app/product.json" )
 
 APIS=$( echo "${APIS}" | jq '. += {"jeanp413.open-remote-ssh": ["resolvers", "tunnels", "terminalDataWriteEvent", "contribRemoteHelp", "contribViewsRemote"]}' )
+APIS=$( echo "${APIS}" | jq '. += {"jeanp413.open-remote-wsl": ["resolvers", "contribRemoteHelp", "contribViewsRemote"]}' )
 
 jsonTmp=$( jq --argjson v "${APIS}" 'setpath(["extensionEnabledApiProposals"]; $v)' product.json )
 echo "${jsonTmp}" > product.json && unset jsonTmp

dev/update_patches.sh

@@ -0,0 +1,80 @@
+#!/usr/bin/env bash
+
+export VSCODE_QUALITY="stable"
+
+while getopts ":i" opt; do
+  case "$opt" in
+    i)
+      export VSCODE_QUALITY="insider"
+      ;;
+    *)
+      ;;
+  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
+  check_file "${FILE}"
+done
+
+if [[ "${VSCODE_QUALITY}" == "insider" ]]; then
+  for FILE in ../patches/insider/*.patch; do
+    check_file "${FILE}"
+  done
+fi
+
+for ARCH in alpine linux osx windows; do
+  for FILE in "../patches/${ARCH}/"*.patch; do
+    if [[ "${FILE}" != *"/arch-"* ]]; then
+      check_file "${FILE}"
+    fi
+  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

docs/accounts-authentication.md

@@ -0,0 +1,17 @@
+# Accounts authentication
+
+## GitHub
+
+The GitHub authentication has been patched to use personal access tokens.
+
+Here is how to create a new personal access token: https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token
+
+## Microsoft
+
+The Microsoft authentication hasn't been patched so its status is unknown.
+
+## When does it happen?
+
+An account authentication occurs only when an extension is asking for it.
+
+For `GitLens`, since the `12 non-plus` version, it won't ask for any new authentication.

docs/build.md

@@ -1,149 +0,0 @@
-# Build
-
-## Table of Contents
-
-- [Dependencies](#dependencies)
-  - [Linux](#dependencies-linux)
-  - [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)
-  - [Manual](#patch-update-process-manual)
-
-## <a id="dependencies"></a>Dependencies
-
-- node 16
-- yarn
-- jq
-- git
-
-### <a id="dependencies-linux"></a>Linux
-
-- GCC
-- make
-- pkg-config
-- libx11-dev
-- libxkbfile-dev
-- libsecret-1-dev
-- fakeroot
-- rpm
-- rpmbuild
-- dpkg
-- python3
-- imagemagick (for AppImage)
-
-### <a id="dependencies-macos"></a>MacOS
-- imagemagick
-- png2icns (`npm install png2icns -g`)
-- librsvg
-
-
-### <a id="dependencies-windows"></a>Windows
-
-- powershell
-- sed
-- 7z
-- [WiX Toolset](http://wixtoolset.org/releases/)
-- python3
-- 'Tools for Native Modules' from official Node.js installer
-
-## <a id="build-scripts"></a>Build Scripts
-
-A build helper script can be found at `build/build.sh`.
-
-- Linux: `./build/build.sh`
-- MacOS: `./build/build.sh`
-- Windows: `powershell -ExecutionPolicy ByPass -File .\build\build.ps1` or `"C:\Program Files\Git\bin\bash.exe" ./build/build.sh`
-
-### Insider
-
-The `insider` version can be built with `./build/build.sh -i` on the `insider` branch.
-
-You can try the lastest version with the command `./build/build.sh -il` but the patches might not be up to date.
-
-## <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
-
-```
-# for the stable version
-cd ./stores/snapcraft/stable
-
-# for the insider version
-cd ./stores/snapcraft/insider
-
-# create the snap
-snapcraft --use-lxd
-
-# verify the snap
-review-tools.snap-review --allow-classic codium*.snap
-```
-
-## <a id="patch-update-process"></a>Patch Update Process
-
-## <a id="patch-update-process-semiauto"></a>Semi-Automated
-
-- run `./build/build_<os>.sh`, if a patch is failing then,
-- run `./build/update_patches.sh`
-- when the script pause at `Press any key when the conflict have been resolved...`, open `vscode` directory in **VSCodium**
-- fix all the `*.rej` files
-- run `yarn watch`
-- run `./script/code.sh` until everything ok
-- press any key to continue the script `update_patches.sh`
-
-## <a id="patch-update-process-manual"></a>Manual
-
-- run `./build/build_<os>.sh`, if a patch is failing then,
-- open `vscode` directory in **VSCodium**
-- revert all changes
-- run `git apply --reject ../patches/<name>.patch`
-- fix all the `*.rej` files
-- run `yarn watch`
-- run `./script/code.sh` until everything ok
-- run `git diff > ../patches/<name>.patch`

docs/extensions-compatibility.md

@@ -0,0 +1,29 @@
+# Extensions compatibility
+
+## Partial Compatibility
+
+- [Python](https://marketplace.visualstudio.com/items?itemName=ms-python.python)
+> [Since May 2021](https://devblogs.microsoft.com/python/python-in-visual-studio-code-may-2021-release/), Python is using a closed source language server ([Pylance](https://marketplace.visualstudio.com/items?itemName=ms-python.vscode-pylance))
+
+## Incompatibility
+
+- [LaTeX Workshop](https://marketplace.visualstudio.com/items?itemName=James-Yu.latex-workshop)
+> It's officially unsupported: https://github.com/James-Yu/LaTeX-Workshop/wiki/FAQ#vscodium-is-not-officially-supported
+
+## Incompatibility due to licensing
+
+The following extensions are not compatible with VSCodium due to their licensing:
+
+- [Live Share](https://marketplace.visualstudio.com/items?itemName=MS-vsliveshare.vsliveshare)
+- [Remote - Containers](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers)
+- [Remote - SSH](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-ssh)
+- [Remote - SSH: Editing Configuration Files](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-ssh-edit)
+- [Remote - WSL](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-wsl)
+
+## Replacements
+
+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

@@ -0,0 +1,121 @@
+# How to build VSCodium
+
+## Table of Contents
+
+- [Dependencies](#dependencies)
+  - [Linux](#dependencies-linux)
+  - [MacOS](#dependencies-macos)
+  - [Windows](#dependencies-windows)
+- [Build Scripts](#build-scripts)
+- [Build Snap](#build-snap)
+- [Patch Update Process](#patch-update-process)
+  - [Semi-Automated](#patch-update-process-semiauto)
+  - [Manual](#patch-update-process-manual)
+
+## <a id="dependencies"></a>Dependencies
+
+- node 20.14
+- yarn
+- jq
+- git
+- python3 3.11
+
+### <a id="dependencies-linux"></a>Linux
+
+- gcc
+- g++
+- make
+- pkg-config
+- libx11-dev
+- libxkbfile-dev
+- libsecret-1-dev
+- libkrb5-dev
+- fakeroot
+- rpm
+- rpmbuild
+- dpkg
+- imagemagick (for AppImage)
+- snapcraft
+
+### <a id="dependencies-macos"></a>MacOS
+
+see [the common dependencies](#dependencies)
+
+### <a id="dependencies-windows"></a>Windows
+
+- powershell
+- sed
+- 7z
+- [WiX Toolset](http://wixtoolset.org/releases/)
+- 'Tools for Native Modules' from the official Node.js installer
+
+## <a id="build-scripts"></a>Build Scripts
+
+A build helper script can be found at `dev/build.sh`.
+
+- Linux: `./dev/build.sh`
+- MacOS: `./dev/build.sh`
+- Windows: `powershell -ExecutionPolicy ByPass -File .\dev\build.ps1` or `"C:\Program Files\Git\bin\bash.exe" ./dev/build.sh`
+
+### Insider
+
+The `insider` version can be built with `./dev/build.sh -i` on the `insider` branch.
+
+You can try the latest version with the command `./dev/build.sh -il` but the patches might not be up to date.
+
+### Flags
+
+The script `dev/build.sh` provides several flags:
+
+- `-i`: build the Insiders version
+- `-l`: build with latest version of Visual Studio Code
+- `-o`: skip the build step
+- `-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-snap"></a>Build Snap
+
+```
+# for the stable version
+cd ./stores/snapcraft/stable
+
+# for the insider version
+cd ./stores/snapcraft/insider
+
+# create the snap
+snapcraft --use-lxd
+
+# verify the snap
+review-tools.snap-review --allow-classic codium*.snap
+```
+
+## <a id="patch-update-process"></a>Patch Update Process
+
+## <a id="patch-update-process-semiauto"></a>Semi-Automated
+
+- run `./dev/build.sh`, if a patch is failing then,
+- run `./dev/update_patches.sh`
+- when the script pauses at `Press any key when the conflict have been resolved...`, open `vscode` directory in **VSCodium**
+- fix all the `*.rej` files
+- run `yarn watch`
+- run `./script/code.sh` until everything is ok
+- press any key to continue the script `update_patches.sh`
+
+## <a id="patch-update-process-manual"></a>Manual
+
+- run `./dev/build.sh`, if a patch is failing then,
+- open `vscode` directory in **VSCodium**
+- revert all changes
+- run `git apply --reject ../patches/<name>.patch`
+- fix all the `*.rej` files
+- run `yarn watch`
+- run `./script/code.sh` until everything is ok
+- run `git diff > ../patches/<name>.patch`
+
+### <a id="icons"></a>icons/build_icons.sh
+
+To run `icons/build_icons.sh`, you will need:
+
+- imagemagick
+- png2icns (`npm install png2icns -g`)
+- librsvg

docs/index.md

@@ -6,26 +6,31 @@
   - [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)
 - [Migrating from Visual Studio Code to VSCodium](#migrating)
 - [Sign in with GitHub](#signin-github)
+- [Accounts authentication](https://github.com/VSCodium/vscodium/blob/master/docs/accounts-authentication.md)
 - [How do I run VSCodium in portable mode?](#portable)
 - [How do I fix the default file manager?](#file-manager)
 - [How do I press and hold a key and have it repeat in VSCodium?](#press-and-hold)
 - [How do I open VSCodium from the terminal?](#terminal-support)
   - [From Linux .tar.gz](#from-linux-targz)
-- [How to build VSCodium](https://github.com/VSCodium/vscodium/blob/master/docs/build.md)
+- [Troubleshooting](https://github.com/VSCodium/vscodium/blob/master/docs/troubleshooting.md)
+- [Contributing](https://github.com/VSCodium/vscodium/blob/master/CONTRIBUTING.md)
+- [How to build VSCodium](https://github.com/VSCodium/vscodium/blob/master/docs/howto-build.md)
 
 ## <a id="disable-telemetry"></a>Getting all the Telemetry Out
 
 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:
 
@@ -56,47 +61,48 @@ By default, the `product.json` file is set up to use [open-vsx.org](https://open
 
 ### <a id="howto-openvsx-marketplace"></a>How to use the Open VSX Registry
 
-As noted above, the [Open VSX Registry](https://open-vsx.org/) is the pre-set extension gallery in VSCodium. Using the extension view in VSCodium will therefore by default use it.  
+As noted above, the [Open VSX Registry](https://open-vsx.org/) is the pre-set extension gallery in VSCodium. Using the extension view in VSCodium will therefore by default use it.
 See [this article](https://www.gitpod.io/blog/open-vsx/) for more information on the motivation behind Open VSX.
 
 ### <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` ***(required)***
+- `VSCODE_GALLERY_ITEM_URL` ***(required)***
+- `VSCODE_GALLERY_CACHE_URL`
+- `VSCODE_GALLERY_CONTROL_URL`
+- `VSCODE_GALLERY_EXTENSION_URL_TEMPLATE` ***(required)***
+- `VSCODE_GALLERY_RESOURCE_URL_TEMPLATE`
 
 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",
-    "controlUrl": ""
+    "serviceUrl": "", // required
+    "itemUrl": "", // required
+    "cacheUrl": "",
+    "controlUrl": "",
+    "extensionUrlTemplate": "", // required
+    "resourceUrlTemplate": "",
   }
 }
 ```
 
 ### <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:
 
-* [Open VSX](https://github.com/eclipse/openvsx) eclipse open-source project  
+* [Open VSX](https://github.com/eclipse/openvsx) eclipse open-source project
   While the public instance which is run by the Eclipse Foundation is the pre-set endpoint in VSCodium, you can host your own instance.
 
     > Open VSX is a [vendor-neutral](https://projects.eclipse.org/projects/ecd.openvsx) open-source alternative to the [Visual Studio Marketplace](https://marketplace.visualstudio.com/vscode). It provides a server application that manages [VS Code extensions](https://code.visualstudio.com/api) in a database, a web application similar to the VS Code Marketplace, and a command-line tool for publishing extensions similar to [vsce](https://code.visualstudio.com/api/working-with-extensions/publishing-extension#vsce).
@@ -105,14 +111,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).
@@ -160,7 +167,7 @@ To copy your settings manually:
 
 In VSCodium, `Sign in with GitHub` is using a Personal Access Token.<br />
 Follow the documentation https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token to create your token.<br />
-Select the scopes dependending of the extension which need access to GitHub. (GitLens requires the `repo` scope.)
+Select the scopes dependending on the extension which needs access to GitHub. (GitLens requires the `repo` scope.)
 
 ### Linux
 
@@ -173,7 +180,7 @@ You can follow the [Portable Mode instructions](https://code.visualstudio.com/do
 
 ## <a id="file-manager"></a>How do I fix the default file manager (Linux)?
 
-In some case, VSCodium becomes the file manager used to open directories (instead of apps like Dolphin or Nautilus).<br />
+In some cases, VSCodium becomes the file manager used to open directories (instead of apps like Dolphin or Nautilus).<br />
 It's due to that no application was defined as the default file manager and so the system is using the latest capable application.
 
 To set the default app, create the file `~/.config/mimeapps.list` with the content like:
@@ -198,7 +205,7 @@ $ defaults write com.vscodium ApplePressAndHoldEnabled -bool false
 
 ## <a id="terminal-support"></a>How do I open VSCodium from the terminal?
 
-For MacOS and Windows:
+For macOS and Windows:
 - Go to the command palette (View | Command Palette...)
 - Choose `Shell command: Install 'codium' command in PATH`.
 

docs/troubleshooting.md

@@ -0,0 +1,90 @@
+# Troubleshooting
+
+## Table of Contents
+
+- [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)
+
+
+## <a id="linux"></a>Linux
+
+#### <a id="linux-fonts-rectangle"></a>*Fonts showing up as rectangles*
+
+The following command should help:
+
+```
+rm -rf ~/.cache/fontconfig
+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:
+
+* libdbusmenu-devel
+* dbus-glib-devel
+* libdbusmenu
+
+On Ubuntu this package is called `libdbusmenu-glib4`.
+
+Credits: [Gerson](https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo/-/issues/91)
+
+#### <a id="linux-flatpak-most-common-issues"></a>*Flatpak most common issues*
+
+- blurry screen with HiDPI on wayland run:
+  ```bash
+  flatpak override --user --nosocket=wayland com.vscodium.codium
+  ```
+- To execute commands on the host system, run inside the sandbox
+  ```bash
+  flatpak-spawn --host <COMMAND>
+  # or
+  host-spawn <COMMAND>
+  ```
+- Where is my X extension? AKA modify product.json
+  TL;DR: use https://open-vsx.org/extension/zokugun/vsix-manager
+
+- SDKs
+  see [this](https://github.com/flathub/com.vscodium.codium?tab=readme-ov-file#sdks)
+
+- 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:
+
+#### <a id="macos-unidentified-developer"></a>*App can't be opened because Apple cannot check it for malicious software*
+
+You can right-click the App and choose `Open`.
+
+#### <a id="macos-quarantine"></a>*"VSCodium.app" is damaged and can’t be opened. You should move it to the Bin.*
+
+The following command will remove the quarantine attribute.
+
+```
+xattr -r -d com.apple.quarantine /Applications/VSCodium.app
+```

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

@@ -9,15 +9,13 @@ if [[ "${CI_BUILD}" != "no" ]]; then
 fi
 
 if [[ -z "${RELEASE_VERSION}" ]]; then
-  if [[ "${VSCODE_QUALITY}" == "insider" ]]; then
-    if [[ "${VSCODE_LATEST}" == "yes" ]] || [[ ! -f "insider.json" ]]; then
-      UPDATE_INFO=$( curl --silent --fail https://update.code.visualstudio.com/api/update/darwin/insider/0000000000000000000000000000000000000000 )
-    else
-      MS_COMMIT=$( jq -r '.commit' insider.json )
-      MS_TAG=$( jq -r '.tag' insider.json )
-    fi
+  if [[ "${VSCODE_LATEST}" == "yes" ]] || [[ ! -f "./upstream/${VSCODE_QUALITY}.json" ]]; then
+    echo "Retrieve lastest version"
+    UPDATE_INFO=$( curl --silent --fail "https://update.code.visualstudio.com/api/update/darwin/${VSCODE_QUALITY}/0000000000000000000000000000000000000000" )
   else
-    UPDATE_INFO=$( curl --silent --fail https://update.code.visualstudio.com/api/update/darwin/stable/0000000000000000000000000000000000000000 )
+    echo "Get version from ${VSCODE_QUALITY}.json"
+    MS_COMMIT=$( jq -r '.commit' "./upstream/${VSCODE_QUALITY}.json" )
+    MS_TAG=$( jq -r '.tag' "./upstream/${VSCODE_QUALITY}.json" )
   fi
 
   if [[ -z "${MS_COMMIT}" ]]; then
@@ -45,13 +43,6 @@ else
       echo "Error: Bad RELEASE_VERSION: ${RELEASE_VERSION}"
       exit 1
     fi
-
-    if [[ "${MS_TAG}" == "$( jq -r '.tag' insider.json )" ]]; then
-      MS_COMMIT=$( jq -r '.commit' insider.json )
-    else
-      echo "Error: No MS_COMMIT for ${RELEASE_VERSION}"
-      exit 1
-    fi
   else
     if [[ "${RELEASE_VERSION}" =~ ^([0-9]+\.[0-9]+\.[0-9]+)\.[0-9]+$ ]];
     then
@@ -61,6 +52,13 @@ else
       exit 1
     fi
   fi
+
+  if [[ "${MS_TAG}" == "$( jq -r '.tag' "./upstream/${VSCODE_QUALITY}.json" )" ]]; then
+    MS_COMMIT=$( jq -r '.commit' "./upstream/${VSCODE_QUALITY}.json" )
+  else
+    echo "Error: No MS_COMMIT for ${RELEASE_VERSION}"
+    exit 1
+  fi
 fi
 
 echo "RELEASE_VERSION=\"${RELEASE_VERSION}\""
@@ -73,11 +71,7 @@ git remote add origin https://github.com/Microsoft/vscode.git
 
 # figure out latest tag by calling MS update API
 if [[ -z "${MS_TAG}" ]]; then
-  if [[ "${VSCODE_QUALITY}" == "insider" ]]; then
-    UPDATE_INFO=$( curl --silent --fail https://update.code.visualstudio.com/api/update/darwin/insider/0000000000000000000000000000000000000000 )
-  else
-    UPDATE_INFO=$( curl --silent --fail https://update.code.visualstudio.com/api/update/darwin/stable/0000000000000000000000000000000000000000 )
-  fi
+  UPDATE_INFO=$( curl --silent --fail "https://update.code.visualstudio.com/api/update/darwin/${VSCODE_QUALITY}/0000000000000000000000000000000000000000" )
   MS_COMMIT=$( echo "${UPDATE_INFO}" | jq -r '.version' )
   MS_TAG=$( echo "${UPDATE_INFO}" | jq -r '.name' )
 elif [[ -z "${MS_COMMIT}" ]]; then
@@ -112,4 +106,4 @@ fi
 
 export MS_TAG
 export MS_COMMIT
-export RELEASE_VERSION
+export RELEASE_VERSION

insider.json

@@ -1 +0,0 @@
-

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"
 

install_remote_dependencies.sh

@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-cd vscode || { echo "'vscode' dir not found"; exit 1; }
-
-yarn --cwd remote --frozen-lockfile --check-files
-
-cd ..
-
-tar -cf remote-dependencies.tar ./vscode/remote/node_modules

npmrc

@@ -0,0 +1,3 @@
+build_from_source="true"
+legacy-peer-deps="true"
+timeout=180000

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

@@ -0,0 +1,61 @@
+diff --git a/src/vs/workbench/contrib/editSessions/browser/editSessionsStorageService.ts b/src/vs/workbench/contrib/editSessions/browser/editSessionsStorageService.ts
+index 1bb5eb3..70f1b37 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 '../../../../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 '../../../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();
+@@ -456,42 +455,2 @@ export class EditSessionsWorkbenchService extends Disposable implements IEditSes
+ 
+-	private registerSignInAction() {
+-		if (!this.serverConfiguration?.url) {
+-			return;
+-		}
+-		const that = this;
+-		const id = 'workbench.editSessions.actions.signIn';
+-		const when = ContextKeyExpr.and(ContextKeyExpr.equals(EDIT_SESSIONS_PENDING_KEY, false), ContextKeyExpr.equals(EDIT_SESSIONS_SIGNED_IN_KEY, false));
+-		this._register(registerAction2(class ResetEditSessionAuthenticationAction extends Action2 {
+-			constructor() {
+-				super({
+-					id,
+-					title: localize('sign in', 'Turn on Cloud Changes...'),
+-					category: EDIT_SESSION_SYNC_CATEGORY,
+-					precondition: when,
+-					menu: [{
+-						id: MenuId.CommandPalette,
+-					},
+-					{
+-						id: MenuId.AccountsContext,
+-						group: '2_editSessions',
+-						when,
+-					}]
+-				});
+-			}
+-
+-			async run() {
+-				return await that.initialize('write', false);
+-			}
+-		}));
+-
+-		this._register(MenuRegistry.appendMenuItem(MenuId.AccountsContext, {
+-			group: '2_editSessions',
+-			command: {
+-				id,
+-				title: localize('sign in badge', 'Turn on Cloud Changes... (1)'),
+-			},
+-			when: ContextKeyExpr.and(ContextKeyExpr.equals(EDIT_SESSIONS_PENDING_KEY, true), ContextKeyExpr.equals(EDIT_SESSIONS_SIGNED_IN_KEY, false))
+-		}));
+-	}
+-
+ 	private registerResetAuthenticationAction() {

patches/disable-signature-verification.patch

@@ -0,0 +1,14 @@
+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,
+@@ -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/ext-from-gh.patch

@@ -0,0 +1,19 @@
+diff --git a/build/lib/builtInExtensions.js b/build/lib/builtInExtensions.js
+index 249777c..129af8a 100644
+--- a/build/lib/builtInExtensions.js
++++ b/build/lib/builtInExtensions.js
+@@ -87,5 +87,2 @@ function getExtensionDownloadStream(extension) {
+     }
+-    else if (productjson.extensionsGallery?.serviceUrl) {
+-        input = ext.fromMarketplace(productjson.extensionsGallery.serviceUrl, extension);
+-    }
+     else {
+diff --git a/build/lib/builtInExtensions.ts b/build/lib/builtInExtensions.ts
+index e9a1180..b8348e3 100644
+--- a/build/lib/builtInExtensions.ts
++++ b/build/lib/builtInExtensions.ts
+@@ -75,4 +75,2 @@ function getExtensionDownloadStream(extension: IExtensionDefinition) {
+ 		input = ext.fromVsix(path.join(root, extension.vsix), extension);
+-	} else if (productjson.extensionsGallery?.serviceUrl) {
+-		input = ext.fromMarketplace(productjson.extensionsGallery.serviceUrl, extension);
+ 	} else {

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,21 +1,21 @@
 diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
-index 8c2aa42..18b0975 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
-@@ -300,2 +300,8 @@ configurationRegistry.registerConfiguration({
+@@ -319,2 +319,8 @@ configurationRegistry.registerConfiguration({
  		},
 +		'workbench.welcomePage.extraAnnouncements': {
 +			scope: ConfigurationScope.MACHINE,
 +			type: 'boolean',
 +			default: true,
-+			description: localize('workbench.welcomePage.extraAnnouncements', "When enabled, the get started page loads additional announcements from VSCodium's repository.")
++			description: localize('workbench.welcomePage.extraAnnouncements', "When enabled, the get started page loads additional announcements from !!APP_NAME!!'s repository.")
 +		},
  		'workbench.startupEditor': {
 diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
-index 9dd5330..9e2b6a2 100644
+index 664c55b..43f9e2e 100644
 --- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
 +++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
-@@ -117,4 +117,8 @@ type GettingStartedActionEvent = {
+@@ -113,4 +113,8 @@ type GettingStartedActionEvent = {
  type RecentEntry = (IRecentFolder | IRecentWorkspace) & { id: string };
 +type AnnouncementEntry = { id: string, title: string, url: string };
  
@@ -24,26 +24,26 @@ index 9dd5330..9e2b6a2 100644
 +const BUILTIN_ANNOUNCEMENTS: AnnouncementEntry[] = [/* BUILTIN_ANNOUNCEMENTS */];
 +
  export class GettingStartedPage extends EditorPane {
-@@ -153,2 +157,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 featuredExtensionsList?: GettingStartedIndexList<IFeaturedExtension>;
-@@ -774,2 +780,3 @@ export class GettingStartedPage extends EditorPane {
+ 
+@@ -812,2 +818,3 @@ export class GettingStartedPage extends EditorPane {
  		const gettingStartedList = this.buildGettingStartedWalkthroughsList();
 +		const announcementList = await this.buildAnnouncementList();
  
-@@ -784,3 +791,3 @@ export class GettingStartedPage extends EditorPane {
+@@ -822,3 +829,3 @@ export class GettingStartedPage extends EditorPane {
  				this.container.classList.remove('noWalkthroughs');
--				reset(rightColumn, featuredExtensionList.getDomElement(), gettingStartedList.getDomElement());
-+				reset(rightColumn, featuredExtensionList.getDomElement(), gettingStartedList.getDomElement(), announcementList.getDomElement());
+-				reset(rightColumn, gettingStartedList.getDomElement());
++				reset(rightColumn, gettingStartedList.getDomElement(), announcementList.getDomElement());
  			}
-@@ -788,3 +795,3 @@ export class GettingStartedPage extends EditorPane {
+@@ -826,3 +833,3 @@ export class GettingStartedPage extends EditorPane {
  				this.container.classList.add('noWalkthroughs');
--				reset(rightColumn, featuredExtensionList.getDomElement());
-+				reset(rightColumn, featuredExtensionList.getDomElement(), announcementList.getDomElement());
+-				reset(rightColumn);
++				reset(rightColumn, announcementList.getDomElement());
  			}
-@@ -946,2 +953,55 @@ export class GettingStartedPage extends EditorPane {
+@@ -978,2 +985,55 @@ export class GettingStartedPage extends EditorPane {
  
 +	private async buildAnnouncementList(): Promise<GettingStartedIndexList<AnnouncementEntry>> {
 +		const renderAnnouncement = (announcement: AnnouncementEntry) => {
@@ -62,7 +62,7 @@ index 9dd5330..9e2b6a2 100644
 +		if (this.announcementList) { this.announcementList.dispose(); }
 +
 +		const announcementList = this.announcementList = new GettingStartedIndexList({
-+			title: localize('announcements', "VSCodium Announcements"),
++			title: localize('announcements', "!!APP_NAME!! Announcements"),
 +			klass: 'announcements',
 +			limit: 5,
 +			empty: $('.empty-recent', {}, localize('noAnnouncements', "There are no current announcements.")),
@@ -75,7 +75,7 @@ index 9dd5330..9e2b6a2 100644
 +
 +			if (showExtras) {
 +				const branch = this.productService.quality === 'insider' ? 'insider' : 'master';
-+				await fetch(`https://raw.githubusercontent.com/VSCodium/vscodium/${branch}/announcements-extra.json`)
++				await fetch(`https://raw.githubusercontent.com/!!GH_REPO_PATH!!/${branch}/announcements-extra.json`)
 +					.then(async res => {
 +						if (res.ok) {
 +							var extraAnnouncements = await res.json() as 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 b120c94..1bb2b88 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.js';
  
 @@ -67,3 +68,3 @@ export class BannerPart extends Part implements IBannerService {
  		@IWorkbenchLayoutService layoutService: IWorkbenchLayoutService,
@@ -31,7 +31,7 @@ index b120c94..1bb2b88 100644
 +		}
 +
  		// Clear previous item
-@@ -234,2 +247,15 @@ export class BannerPart extends Part implements IBannerService {
+@@ -235,2 +248,15 @@ export class BannerPart extends Part implements IBannerService {
  
 +	private toStorageScope(options: INeverShowAgainOptions): StorageScope {
 +		switch (options.scope) {
@@ -47,31 +47,15 @@ index b120c94..1bb2b88 100644
 +	}
 +
  	toJSON(): object {
-diff --git a/src/vs/workbench/electron-sandbox/window.ts b/src/vs/workbench/electron-sandbox/window.ts
-index cf6af9d..108ce8f 100644
---- a/src/vs/workbench/electron-sandbox/window.ts
-+++ b/src/vs/workbench/electron-sandbox/window.ts
-@@ -725,3 +725,4 @@ export class NativeWindow extends Disposable {
- 					actions,
--					icon: Codicon.warning
-+					icon: Codicon.warning,
-+					neverShowAgain: { id: 'windowseol', isSecondary: true, scope: NeverShowAgainScope.APPLICATION }
- 				});
-@@ -764,3 +765,4 @@ export class NativeWindow extends Disposable {
- 					actions,
--					icon: Codicon.warning
-+					icon: Codicon.warning,
-+					neverShowAgain: { id: 'macoseol', isSecondary: true, scope: NeverShowAgainScope.APPLICATION }
- 				});
 diff --git a/src/vs/workbench/services/banner/browser/bannerService.ts b/src/vs/workbench/services/banner/browser/bannerService.ts
-index 639b1b2..70e8847 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.js';
  
 @@ -18,2 +19,3 @@ export interface IBannerItem {
  	readonly onClose?: () => void;
 +	readonly neverShowAgain?: INeverShowAgainOptions;
- }
+ 	readonly closeLabel?: string;

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

@@ -1,9 +1,9 @@
 diff --git a/.vscode/settings.json b/.vscode/settings.json
-index 7ae8bce..724b9ad 100644
+index 99e495a..996044a 100644
 --- a/.vscode/settings.json
 +++ b/.vscode/settings.json
-@@ -9,5 +9,5 @@
- 		"cli/target": true,
+@@ -10,5 +10,5 @@
+ 		"build/**/*.js.map": true,
 -		"build/**/*.js": {
 -			"when": "$(basename).ts"
 -		}
@@ -11,14 +11,27 @@ index 7ae8bce..724b9ad 100644
 +		// 	"when": "$(basename).ts"
 +		// }
  	},
-@@ -81,3 +81,3 @@
+@@ -59,2 +59,3 @@
+ 		"build/npm/*.js": true,
++		"build/**/*.js": true,
+ 		"build/*.js": true
+@@ -108,3 +109,3 @@
  	"gulp.autoDetect": "off",
 -	"files.insertFinalNewline": true,
 +	// "files.insertFinalNewline": true,
  	"[plaintext]": {
-@@ -91,4 +91,4 @@
- 	"[javascript]": {
+@@ -114,3 +115,3 @@
  		"editor.defaultFormatter": "vscode.typescript-language-features",
 -		"editor.formatOnSave": true
 +		// "editor.formatOnSave": true
  	},
+@@ -118,3 +119,3 @@
+ 		"editor.defaultFormatter": "vscode.typescript-language-features",
+-		"editor.formatOnSave": true
++		// "editor.formatOnSave": true
+ 	},
+@@ -122,3 +123,3 @@
+ 		"editor.defaultFormatter": "rust-lang.rust-analyzer",
+-		"editor.formatOnSave": true,
++		// "editor.formatOnSave": true,
+ 	},

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/!!GH_REPO_PATH!!-insiders/releases/download/${version}.${release}-insider/!!APP_NAME_LC!!-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/!!GH_REPO_PATH!!-insiders/releases/download/${version}.${release}-insider/!!APP_NAME_LC!!-reh-${os}-${arch}-${version}.${release}-insider.tar.gz' }))
+ 			.pipe(es.through(function (file) {

patches/insider/disable-windows-appx.patch

@@ -1,15 +1,15 @@
 diff --git a/build/gulpfile.vscode.win32.js b/build/gulpfile.vscode.win32.js
-index 0d3abda..9e5143a 100644
+index 5adfdfb..dfdb2af 100644
 --- a/build/gulpfile.vscode.win32.js
 +++ b/build/gulpfile.vscode.win32.js
-@@ -116,6 +116,6 @@ function buildWin32Setup(arch, target) {
+@@ -115,6 +115,6 @@ function buildWin32Setup(arch, target) {
  
 -		if (quality === 'insider') {
--			definitions['AppxPackage'] = `code_insiders_explorer_${arch === 'ia32' ? 'x86' : arch}.appx`;
+-			definitions['AppxPackage'] = `code_insiders_explorer_${arch}.appx`;
 -			definitions['AppxPackageFullname'] = `Microsoft.${product.win32RegValueName}_1.0.0.0_neutral__8wekyb3d8bbwe`;
 -		}
 +		// if (quality === 'insider') {
-+		// 	definitions['AppxPackage'] = `code_insiders_explorer_${arch === 'ia32' ? 'x86' : arch}.appx`;
++		// 	definitions['AppxPackage'] = `code_insiders_explorer_${arch}.appx`;
 +		// 	definitions['AppxPackageFullname'] = `Microsoft.${product.win32RegValueName}_1.0.0.0_neutral__8wekyb3d8bbwe`;
 +		// }
  

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/avoid-crash-16k-page-size.patch

@@ -0,0 +1,17 @@
+diff --git a/src/main.ts b/src/main.ts
+index c132c9b..51a7290 100644
+--- a/src/main.ts
++++ b/src/main.ts
+@@ -524,2 +524,12 @@ function getJSFlags(cliArgs: NativeParsedArgs): string | null {
+ 
++	// Fix cppgc crash on Linux with 16KB page size.
++	// Refs https://issues.chromium.org/issues/378017037
++	// The fix from https://github.com/electron/electron/commit/6c5b2ef55e08dc0bede02384747549c1eadac0eb
++	// only affects non-renderer process.
++	// The following will ensure that the flag will be
++	// applied to the renderer process as well.
++	// TODO: Remove this once we update to
++	// Chromium >= 134.
++	jsFlags.push('--nodecommit_pooled_pages');
++
+ 	return jsFlags.length > 0 ? jsFlags.join(' ') : null;

patches/linux/client/disable-remote.patch

@@ -0,0 +1,14 @@
+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/fix-build.patch

@@ -1,43 +1,48 @@
 diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js
-index 0d7d3c5..90f75cc 100644
+index fb0e5a4..412a6cc 100644
 --- a/build/gulpfile.vscode.linux.js
 +++ b/build/gulpfile.vscode.linux.js
-@@ -299,4 +299,3 @@ BUILD_TARGETS.forEach(({ arch }) => {
- 	const prepareDebTask = task.define(`vscode-linux-${arch}-prepare-deb`, task.series(util.rimraf(`.build/linux/deb/${debArch}`), prepareDebPackage(arch)));
+@@ -197,2 +197,3 @@ function prepareRpmPackage(arch) {
+ 		const spec = code.pipe(es.through(
++			null,
+ 			async function () {
+@@ -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);
-@@ -305,4 +304,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 0ea6699..c4524de 100644
+index 39e2b4e..aae72ae 100644
 --- a/build/linux/dependencies-generator.js
 +++ b/build/linux/dependencies-generator.js
-@@ -22,3 +22,3 @@ const types_2 = require("./rpm/types");
+@@ -27,3 +27,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/108.0.5359.215:chrome/installer/linux/BUILD.gn;l=64-80
+ // Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/132.0.6834.196:chrome/installer/linux/BUILD.gn;l=64-80
+@@ -60,3 +60,3 @@ async function getDependencies(packageType, buildDir, applicationName, arch) {
+     // Add the tunnel binary.
+-    files.push(path_1.default.join(buildDir, 'bin', product.tunnelApplicationName));
++    // files.push(path_1.default.join(buildDir, 'bin', product.tunnelApplicationName));
+     // Add the main executable.
 diff --git a/build/linux/dependencies-generator.ts b/build/linux/dependencies-generator.ts
-index c0d8112..3bb0366 100644
+index 83d2ec7..6c14583 100644
 --- a/build/linux/dependencies-generator.ts
 +++ b/build/linux/dependencies-generator.ts
-@@ -23,3 +23,3 @@ import { isRpmArchString, RpmArchString } from './rpm/types';
+@@ -25,3 +25,3 @@ import product = require('../../product.json');
  // are valid, are in dep-lists.ts
 -const FAIL_BUILD_FOR_NEW_DEPENDENCIES: boolean = true;
 +const FAIL_BUILD_FOR_NEW_DEPENDENCIES: boolean = false;
  
-diff --git a/resources/linux/rpm/code.spec.template b/resources/linux/rpm/code.spec.template
-index 06b8549..a7e3dfb 100644
---- a/resources/linux/rpm/code.spec.template
-+++ b/resources/linux/rpm/code.spec.template
-@@ -81 +81,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
+@@ -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.

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/s390x/arch-4-s390x-package.json.patch

@@ -0,0 +1,26 @@
+diff --git a/package-lock.json b/package-lock.json
+index fd395eb..f56bc78 100644
+--- a/package-lock.json
++++ b/package-lock.json
+@@ -18274,6 +18274,7 @@
+     "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"
+     },
+diff --git a/package.json b/package.json
+index eb0abcc..40b107a 100644
+--- a/package.json
++++ b/package.json
+@@ -226,2 +226,5 @@
+       "node-addon-api": "7.1.0"
++    },
++    "@vscode/l10n-dev@0.0.35": {
++      "web-tree-sitter": "0.23.0"
+     }

patches/linux/rpm.patch

@@ -0,0 +1,14 @@
+diff --git a/resources/linux/rpm/code.spec.template b/resources/linux/rpm/code.spec.template
+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:  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/yarn-dependencies.patch

@@ -0,0 +1,17 @@
+diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
+index c1f22aa5002..a6fb2728b1f 100644
+--- a/build/npm/postinstall.js
++++ b/build/npm/postinstall.js
+@@ -53,8 +53,10 @@ function npmInstall(dir, opts) {
+ 		log(dir, `Installing dependencies inside container ${process.env['VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME']}...`);
+ 
+ 		opts.cwd = root;
+-		if (process.env['npm_config_arch'] === 'arm64') {
+-			run('sudo', ['docker', 'run', '--rm', '--privileged', 'multiarch/qemu-user-static', '--reset', '-p', 'yes'], opts);
++		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') && process.env['DISABLE_QEMU'] !== 'true') {
++			run('sudo', ['docker', 'run', '--rm', '--privileged', 'tonistiigi/binfmt:latest', '--install', 'all'], opts);
++		} else if (process.env['npm_config_arch'] === 'loong64') {
++			run('sudo', ['docker', 'run', '--rm', '--privileged', 'loongcr.lcpu.dev/multiarch/archlinux', '--reset', '-p', 'yes'], opts);
+ 		}
+ 		run('sudo', ['docker', 'run', '-e', 'GITHUB_TOKEN', '-v', `${process.env['VSCODE_HOST_MOUNT']}:/root/vscode`, '-v', `${process.env['VSCODE_HOST_MOUNT']}/.build/.netrc:/root/.netrc`, '-w', path.resolve('/root/vscode', dir), process.env['VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME'], 'sh', '-c', `\"chown -R root:root ${path.resolve('/root/vscode', dir)} && npm i -g node-gyp-build && npm ci\"`], opts);
+ 		run('sudo', ['chown', '-R', `${userinfo.uid}:${userinfo.gid}`, `${path.resolve(root, dir)}`], opts);

patches/merge-user-product.patch

@@ -1,44 +1,50 @@
-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 c132c9b..9684685 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) {
+@@ -208,2 +222,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..3837df0 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) {
+@@ -29,2 +29,38 @@ else if (globalThis._VSCODE_PRODUCT_JSON && globalThis._VSCODE_PACKAGE_JSON) {
  
-+	const { serviceUrl, searchUrl, itemUrl, controlUrl } = product.extensionsGallery || {};
++	const { serviceUrl, publisherUrl, itemUrl, controlUrl, extensionUrlTemplate, resourceUrlTemplate } = product.extensionsGallery || {};
 +
 +	Object.assign(product, {
 +		extensionsGallery: {
 +			serviceUrl: env['VSCODE_GALLERY_SERVICE_URL'] || serviceUrl,
-+			searchUrl: env['VSCODE_GALLERY_SEARCH_URL'] || searchUrl,
++			publisherUrl: env['VSCODE_GALLERY_PUBLISHER_URL'] || publisherUrl,
 +			itemUrl: env['VSCODE_GALLERY_ITEM_URL'] || itemUrl,
 +			controlUrl: env['VSCODE_GALLERY_CONTROL_URL'] || controlUrl,
++			extensionUrlTemplate: env['VSCODE_GALLERY_EXTENSION_URL_TEMPLATE'] || extensionUrlTemplate,
++			resourceUrlTemplate: env['VSCODE_GALLERY_RESOURCE_URL_TEMPLATE'] || resourceUrlTemplate,
 +		}
 +	});
 +

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-codesign.patch

@@ -0,0 +1,30 @@
+diff --git a/build/darwin/sign.js b/build/darwin/sign.js
+index dff30fd..df48bee 100644
+--- a/build/darwin/sign.js
++++ b/build/darwin/sign.js
+@@ -56,5 +56,7 @@ async function main(buildDir) {
+         ignore: (filePath) => {
++            const ext = path_1.default.extname(filePath);
+             return filePath.includes(gpuHelperAppName) ||
+                 filePath.includes(rendererHelperAppName) ||
+-                filePath.includes(pluginHelperAppName);
++                filePath.includes(pluginHelperAppName) ||
++                ext == '.asar' || ext == '.dat' || ext == '.gif' || ext == '.icns' || ext == '.ico' || ext == '.json' || ext == '.mp3' || ext == '.nib' || ext == '.pak' || ext == '.png' || ext == '.scpt' || ext == '.ttf' || ext == '.wasm' || ext == '.woff' || ext == '.woff2';
+         }
+diff --git a/build/darwin/sign.ts b/build/darwin/sign.ts
+index ecf1627..a414032 100644
+--- a/build/darwin/sign.ts
++++ b/build/darwin/sign.ts
+@@ -60,6 +60,9 @@ async function main(buildDir?: string): Promise<void> {
+ 		ignore: (filePath: string) => {
+-			return filePath.includes(gpuHelperAppName) ||
+-				filePath.includes(rendererHelperAppName) ||
+-				filePath.includes(pluginHelperAppName);
++			const ext = path.extname(filePath);
++            return filePath.includes(gpuHelperAppName) ||
++                filePath.includes(rendererHelperAppName) ||
++                filePath.includes(pluginHelperAppName) ||
++				ext == '.asar' || ext == '.dat' || ext == '.gif' || ext == '.icns' || ext == '.ico' || ext == '.json' || ext == '.mp3' || ext == '.nib' || ext == '.pak' || ext == '.png' || ext == '.scpt' || ext == '.ttf' || ext == '.wasm' || ext == '.woff' || ext == '.woff2';
+ 		}
++
+ 	};

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/!!GH_REPO_PATH!!/releases/latest';
++						const insidersURL = 'https://github.com/!!GH_REPO_PATH!!-insiders/releases/latest';
+ 						this.openerService.open(quality === 'stable' ? stableURL : insidersURL);

patches/ppc64le-support.patch

@@ -1,264 +0,0 @@
-diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
-index 2a0c236eaf0..be2528c5c48 100644
---- a/build/gulpfile.reh.js
-+++ b/build/gulpfile.reh.js
-@@ -46,6 +46,7 @@ const BUILD_TARGETS = [
- 	{ platform: 'linux', arch: 'x64' },
- 	{ platform: 'linux', arch: 'armhf' },
- 	{ platform: 'linux', arch: 'arm64' },
-+	{ platform: 'linux', arch: 'ppc64le' },
- 	{ 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)
-diff --git a/build/gulpfile.scan.js b/build/gulpfile.scan.js
-index 62691fcc8cf..dbefb8549f1 100644
---- a/build/gulpfile.scan.js
-+++ b/build/gulpfile.scan.js
-@@ -24,6 +24,7 @@ const BUILD_TARGETS = [
- 	{ platform: 'linux', arch: 'x64' },
- 	{ platform: 'linux', arch: 'armhf' },
- 	{ platform: 'linux', arch: 'arm64' },
-+	{ platform: 'linux', arch: 'ppc64le' },
- ];
- 
- BUILD_TARGETS.forEach(buildTarget => {
-diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index 0ca2cfd60a9..18a60efc405 100644
---- a/build/gulpfile.vscode.js
-+++ b/build/gulpfile.vscode.js
-@@ -426,6 +426,7 @@ const BUILD_TARGETS = [
- 	{ platform: 'linux', arch: 'x64' },
- 	{ platform: 'linux', arch: 'armhf' },
- 	{ platform: 'linux', arch: 'arm64' },
-+	{ platform: 'linux', arch: 'ppc64le' },
- ];
- BUILD_TARGETS.forEach(buildTarget => {
- 	const dashed = (str) => (str ? `-${str}` : ``);
-diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js
-index 90f75ccfabd..a9fe7715da9 100644
---- a/build/gulpfile.vscode.linux.js
-+++ b/build/gulpfile.vscode.linux.js
-@@ -29,7 +29,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' }[arch];
- }
- 
- function prepareDebPackage(arch) {
-@@ -136,7 +136,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' }[arch];
- }
- 
- /**
-@@ -292,6 +292,7 @@ const BUILD_TARGETS = [
- 	{ arch: 'x64' },
- 	{ arch: 'armhf' },
- 	{ arch: 'arm64' },
-+	{ arch: 'ppc64le' },
- ];
- 
- BUILD_TARGETS.forEach(({ arch }) => {
-diff --git a/build/linux/debian/calculate-deps.ts b/build/linux/debian/calculate-deps.ts
-index b13d3cdfaaf..650e4de3894 100644
---- a/build/linux/debian/calculate-deps.ts
-+++ b/build/linux/debian/calculate-deps.ts
-@@ -52,6 +52,9 @@ function calculatePackageDeps(binaryPath: string, arch: DebianArchString, sysroo
- 		case 'arm64':
- 			cmd.push(`-l${sysroot}/usr/lib/aarch64-linux-gnu`,
- 				`-l${sysroot}/lib/aarch64-linux-gnu`);
-+		case 'ppc64le':
-+			cmd.push(`-l${sysroot}/usr/lib/ppc64le-linux-gnu`,
-+				`-l${sysroot}/lib/ppc64le-linux-gnu`);
- 			break;
- 	}
- 	cmd.push(`-l${sysroot}/usr/lib`);
-diff --git a/build/linux/debian/dep-lists.ts b/build/linux/debian/dep-lists.ts
-index 52aa56d960b..857589ec9ff 100644
---- a/build/linux/debian/dep-lists.ts
-+++ b/build/linux/debian/dep-lists.ts
-@@ -136,5 +136,44 @@ export const referenceGeneratedDepsByArch = {
- 		'libxkbfile1',
- 		'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.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/types.ts b/build/linux/debian/types.ts
-index e97485ef128..356027a648b 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';
- 
- export function isDebianArchString(s: string): s is DebianArchString {
--	return ['amd64', 'armhf', 'arm64'].includes(s);
-+	return ['amd64', 'armhf', 'arm64', 'ppc64le'].includes(s);
- }
-diff --git a/cli/src/update_service.rs b/cli/src/update_service.rs
-index b03d8ea5963..2beceeac640 100644
---- a/cli/src/update_service.rs
-+++ b/cli/src/update_service.rs
-@@ -209,6 +209,7 @@ pub enum Platform {
- 	LinuxX64,
- 	LinuxARM64,
- 	LinuxARM32,
-+	LinuxPPC64LE,
- 	DarwinX64,
- 	DarwinARM64,
- 	WindowsX64,
-@@ -222,6 +223,7 @@ 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::DarwinX64 => Some("darwin".to_owned()),
- 			Platform::DarwinARM64 => Some("darwin-arm64".to_owned()),
- 			Platform::WindowsX64 => Some("win32-x64-archive".to_owned()),
-@@ -237,6 +239,7 @@ impl Platform {
- 			Platform::LinuxX64 => "server-linux-x64",
- 			Platform::LinuxARM64 => "server-linux-arm64",
- 			Platform::LinuxARM32 => "server-linux-armhf",
-+			Platform::LinuxPPC64LE => "server-linux-ppc64le",
- 			Platform::DarwinX64 => "server-darwin",
- 			Platform::DarwinARM64 => "server-darwin-arm64",
- 			Platform::WindowsX64 => "server-win32-x64",
-@@ -253,6 +256,7 @@ impl Platform {
- 			Platform::LinuxX64 => "cli-linux-x64",
- 			Platform::LinuxARM64 => "cli-linux-arm64",
- 			Platform::LinuxARM32 => "cli-linux-armhf",
-+			Platform::LinuxPPC64LE => "cli-linux-ppc64le",
- 			Platform::DarwinX64 => "cli-darwin-x64",
- 			Platform::DarwinARM64 => "cli-darwin-arm64",
- 			Platform::WindowsARM64 => "cli-win32-arm64",
-@@ -285,6 +289,8 @@ 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 = "macos", target_arch = "x86_64")) {
- 			Some(Platform::DarwinX64)
- 		} else if cfg!(all(target_os = "macos", target_arch = "aarch64")) {
-@@ -309,6 +315,7 @@ impl fmt::Display for Platform {
- 			Platform::LinuxX64 => "LinuxX64",
- 			Platform::LinuxARM64 => "LinuxARM64",
- 			Platform::LinuxARM32 => "LinuxARM32",
-+			Platform::LinuxPPC64LE => "LinuxPPC64LE",
- 			Platform::DarwinX64 => "DarwinX64",
- 			Platform::DarwinARM64 => "DarwinARM64",
- 			Platform::WindowsX64 => "WindowsX64",
-diff --git a/cli/src/util/prereqs.rs b/cli/src/util/prereqs.rs
-index d8cbd1b91dd..191d312e994 100644
---- a/cli/src/util/prereqs.rs
-+++ b/cli/src/util/prereqs.rs
-@@ -64,6 +64,8 @@ impl PreReqChecker {
- 				Platform::LinuxX64
- 			} else if cfg!(target_arch = "arm") {
- 				Platform::LinuxARM32
-+			} else if cfg!(target_arch = "ppc64le") {
-+				Platform::LinuxPPC64LE
- 			} else {
- 				Platform::LinuxARM64
- 			});
-diff --git a/src/main.js b/src/main.js
-index d986fee6f6d..02cd26a4d93 100644
---- a/src/main.js
-+++ b/src/main.js
-@@ -405,6 +405,7 @@ function configureCrashReporter() {
- 						}
- 					}
- 				} else if (isLinux) {
-+
- 					submitURL = appCenter['linux-x64'];
- 				}
- 				submitURL = submitURL.concat('&uid=', crashReporterId, '&iid=', crashReporterId, '&sid=', crashReporterId);
-diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts
-index d407374f6ee..636da84fd62 100644
---- a/src/vs/platform/extensionManagement/common/extensionManagement.ts
-+++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts
-@@ -28,6 +28,7 @@ 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 PPC64LE';
- 
- 		case TargetPlatform.ALPINE_X64: return 'Alpine Linux 64 bit';
- 		case TargetPlatform.ALPINE_ARM64: return 'Alpine ARM 64';
-@@ -52,6 +53,7 @@ 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.ALPINE_X64: return TargetPlatform.ALPINE_X64;
- 		case TargetPlatform.ALPINE_ARM64: return TargetPlatform.ALPINE_ARM64;
-@@ -90,6 +92,9 @@ export function getTargetPlatform(platform: Platform | 'alpine', arch: string |
- 			if (arch === 'arm') {
- 				return TargetPlatform.LINUX_ARMHF;
- 			}
-+			if (arch === 'ppc64le') {
-+				return TargetPlatform.LINUX_PPC64LE;
-+			}
- 			return TargetPlatform.UNKNOWN;
- 
- 		case 'alpine':
-diff --git a/src/vs/platform/extensions/common/extensions.ts b/src/vs/platform/extensions/common/extensions.ts
-index cfa0e3296f0..d38a82114e3 100644
---- a/src/vs/platform/extensions/common/extensions.ts
-+++ b/src/vs/platform/extensions/common/extensions.ts
-@@ -296,6 +296,7 @@ export const enum TargetPlatform {
- 	LINUX_X64 = 'linux-x64',
- 	LINUX_ARM64 = 'linux-arm64',
- 	LINUX_ARMHF = 'linux-armhf',
-+	LINUX_PPC64LE = 'linux-ppc64le',
- 
- 	ALPINE_X64 = 'alpine-x64',
- 	ALPINE_ARM64 = 'alpine-arm64',

patches/remove-mangle.patch

@@ -1,15 +1,15 @@
 diff --git a/build/lib/compilation.js b/build/lib/compilation.js
-index 2270e05..1bd7b90 100644
+index 841dbe1..7cf692a 100644
 --- a/build/lib/compilation.js
 +++ b/build/lib/compilation.js
-@@ -104,24 +104,3 @@ function compileTask(src, out, build, options = {}) {
+@@ -148,24 +148,3 @@ function compileTask(src, out, build, options = {}) {
          }
 -        // mangle: TypeScript to TypeScript
--        let mangleStream = es.through();
+-        let mangleStream = event_stream_1.default.through();
 -        if (build && !options.disableMangle) {
--            let ts2tsMangler = new index_1.Mangler(compile.projectPath, (...data) => fancyLog(ansiColors.blue('[mangler]'), ...data), { mangleExports: true, manglePrivateFields: true });
+-            let ts2tsMangler = new index_1.Mangler(compile.projectPath, (...data) => (0, fancy_log_1.default)(ansi_colors_1.default.blue('[mangler]'), ...data), { mangleExports: true, manglePrivateFields: true });
 -            const newContentsByFileName = ts2tsMangler.computeNewFileContents(new Set(['saveState']));
--            mangleStream = es.through(async function write(data) {
+-            mangleStream = event_stream_1.default.through(async function write(data) {
 -                const tsNormalPath = ts.normalizePath(data.path);
 -                const newContents = (await newContentsByFileName).get(tsNormalPath);
 -                if (newContents !== undefined) {
@@ -28,10 +28,15 @@ index 2270e05..1bd7b90 100644
 -            .pipe(mangleStream)
              .pipe(generator.stream)
 diff --git a/build/lib/compilation.ts b/build/lib/compilation.ts
-index d5da3f1..fa46962 100644
+index 6e1fcab..4e45106 100644
 --- a/build/lib/compilation.ts
 +++ b/build/lib/compilation.ts
-@@ -123,27 +123,3 @@ export function compileTask(src: string, out: string, build: boolean, options: {
+@@ -18,4 +18,2 @@ import File from 'vinyl';
+ import * as task from './task';
+-import { Mangler } from './mangle/index';
+-import { RawSourceMap } from 'source-map';
+ import { gulpPostcss } from './postcss';
+@@ -138,27 +136,3 @@ export function compileTask(src: string, out: string, build: boolean, options: {
  
 -		// mangle: TypeScript to TypeScript
 -		let mangleStream = es.through();

patches/report-issue.patch

@@ -1,16 +1,22 @@
-diff --git a/src/vs/code/electron-sandbox/issue/issueReporterService.ts b/src/vs/code/electron-sandbox/issue/issueReporterService.ts
-index d0c4789..9e6bfc5 100644
---- a/src/vs/code/electron-sandbox/issue/issueReporterService.ts
-+++ b/src/vs/code/electron-sandbox/issue/issueReporterService.ts
-@@ -455,5 +455,5 @@ export class IssueReporter extends Disposable {
+diff --git a/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsSlowActions.ts b/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsSlowActions.ts
+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 {
+ - OS Version: \`${osVersion}\`
+-- VS Code version: \`${this._productService.version}\`\n\n${message}`);
++- !!APP_NAME!! version: \`${this._productService.version}\`\n\n${message}`);
  
--	private searchVSCodeIssues(title: string, issueDescription?: string): void {
-+	private 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);
++			this.searchGitHub('!!GH_REPO_PATH!!', title);
  		} else {
-@@ -549,33 +549,2 @@ export class IssueReporter extends Disposable {
+@@ -722,33 +722,2 @@ export class BaseIssueReporterService extends Disposable {
  
 -	@debounce(300)
 -	private searchDuplicates(title: string, body?: string): void {
@@ -26,7 +32,7 @@ index d0c4789..9e6bfc5 100644
 -			})
 -		};
 -
--		window.fetch(url, init).then((response) => {
+-		fetch(url, init).then((response) => {
 -			response.json().then(result => {
 -				this.clearSearchResults();
 -
@@ -44,40 +50,38 @@ index d0c4789..9e6bfc5 100644
 -	}
 -
  	private displaySearchResults(results: SearchResult[]) {
-@@ -667,3 +636,3 @@ export class IssueReporter extends Disposable {
+@@ -844,4 +813,4 @@ export class BaseIssueReporterService extends Disposable {
  		sourceSelect.append(this.makeOption('', localize('selectSource', "Select source"), true));
--		sourceSelect.append(this.makeOption('vscode', localize('vscode', "Visual Studio Code"), false));
-+		sourceSelect.append(this.makeOption('vscode', localize('vscode', "VSCodium"), false));
- 		sourceSelect.append(this.makeOption('extension', localize('extension', "An extension"), false));
-diff --git a/src/vs/code/electron-sandbox/issue/issueReporterModel.ts b/src/vs/code/electron-sandbox/issue/issueReporterModel.ts
-index 98338df..6d2f581 100644
---- a/src/vs/code/electron-sandbox/issue/issueReporterModel.ts
-+++ b/src/vs/code/electron-sandbox/issue/issueReporterModel.ts
-@@ -77,3 +77,3 @@ ${this._data.issueDescription}
+-		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', "!!APP_NAME!!"), false));
++		sourceSelect.append(this.makeOption(IssueSource.Extension, localize('extension', "A !!APP_NAME!! extension"), false));
+ 		if (this.product.reportMarketplaceIssueUrl) {
+@@ -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 !!APP_NAME!!"));
+ 			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 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}
  ${this.getExtensionVersion()}
 -VS Code version: ${this._data.versionInfo && this._data.versionInfo.vscodeVersion}
-+VSCodium version: ${this._data.versionInfo && this._data.versionInfo.vscodeVersion}
++!!APP_NAME!! version: ${this._data.versionInfo && this._data.versionInfo.vscodeVersion}
  OS version: ${this._data.versionInfo && this._data.versionInfo.os}
-diff --git a/src/vs/code/electron-sandbox/issue/issueReporterPage.ts b/src/vs/code/electron-sandbox/issue/issueReporterPage.ts
-index 0eedb21..c83e092 100644
---- a/src/vs/code/electron-sandbox/issue/issueReporterPage.ts
-+++ b/src/vs/code/electron-sandbox/issue/issueReporterPage.ts
-@@ -17,3 +17,3 @@ const reviewGuidanceLabel = localize( // intentionally not escaped because of it
+diff --git a/src/vs/workbench/contrib/issue/browser/issueReporterPage.ts b/src/vs/workbench/contrib/issue/browser/issueReporterPage.ts
+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
  		comment: [
 -			'{Locked="<a href=\"https://github.com/microsoft/vscode/wiki/Submitting-Bugs-and-Suggestions\" target=\"_blank\">"}',
-+			'{Locked="<a href=\"https://github.com/VSCodium/vscodium/wiki/Submitting-Bugs-and-Suggestions\" target=\"_blank\">"}',
++			'{Locked="<a href=\"https://github.com/!!GH_REPO_PATH!!/wiki/Submitting-Bugs-and-Suggestions\" target=\"_blank\">"}',
  			'{Locked="</a>"}'
-@@ -21,3 +21,3 @@ const reviewGuidanceLabel = localize( // intentionally not escaped because of it
+@@ -22,3 +22,3 @@ const reviewGuidanceLabel = localize( // intentionally not escaped because of it
  	},
 -	'Before you report an issue here please <a href="https://github.com/microsoft/vscode/wiki/Submitting-Bugs-and-Suggestions" target="_blank">review the guidance we provide</a>.'
-+	'Before you report an issue here please <a href="https://github.com/VSCodium/vscodium/wiki/Submitting-Bugs-and-Suggestions" target="_blank">review the guidance we provide</a>.'
++	'Before you report an issue here please <a href="https://github.com/!!GH_REPO_PATH!!/wiki/Submitting-Bugs-and-Suggestions" target="_blank">review the guidance we provide</a>.'
  );
-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
---- 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 {
- - OS Version: \`${osVersion}\`
--- VS Code version: \`${this._productService.version}\`\n\n${message}`);
-+- VSCodium version: \`${this._productService.version}\`\n\n${message}`);
- 

patches/terminal-suggest.patch

@@ -0,0 +1,44 @@
+diff --git a/extensions/terminal-suggest/src/completions/codium-insiders.ts b/extensions/terminal-suggest/src/completions/codium-insiders.ts
+new file mode 100644
+index 0000000..a5769b1
+--- /dev/null
++++ b/extensions/terminal-suggest/src/completions/codium-insiders.ts
+@@ -0,0 +1,9 @@
++import code from './code';
++
++const codiumInsidersCompletionSpec: Fig.Spec = {
++	...code,
++	name: '!!BINARY_NAME!!-insiders',
++	description: '!!APP_NAME!! Insiders',
++};
++
++export default codiumInsidersCompletionSpec;
+diff --git a/extensions/terminal-suggest/src/completions/codium.ts b/extensions/terminal-suggest/src/completions/codium.ts
+new file mode 100644
+index 0000000..b1fa812
+--- /dev/null
++++ b/extensions/terminal-suggest/src/completions/codium.ts
+@@ -0,0 +1,9 @@
++import code from './code';
++
++const codiumCompletionSpec: Fig.Spec = {
++	...code,
++	name: '!!BINARY_NAME!!',
++	description: '!!APP_NAME!!',
++};
++
++export default codiumCompletionSpec;
+diff --git a/extensions/terminal-suggest/src/terminalSuggestMain.ts b/extensions/terminal-suggest/src/terminalSuggestMain.ts
+index 3f181bc..34054ed 100644
+--- a/extensions/terminal-suggest/src/terminalSuggestMain.ts
++++ b/extensions/terminal-suggest/src/terminalSuggestMain.ts
+@@ -12,2 +12,4 @@ import codeCompletionSpec from './completions/code';
+ import codeInsidersCompletionSpec from './completions/code-insiders';
++import codiumCompletionSpec from './completions/codium';
++import codiumInsidersCompletionSpec from './completions/codium-insiders';
+ import setLocationSpec from './completions/set-location';
+@@ -52,2 +54,4 @@ export const availableSpecs: Fig.Spec[] = [
+ 	codeCompletionSpec,
++	codiumInsidersCompletionSpec,
++	codiumCompletionSpec,
+ 	setLocationSpec,

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,191 @@
+diff --git a/.npmrc b/.npmrc
+index e10d4a0..4553a7b 100644
+--- a/.npmrc
++++ b/.npmrc
+@@ -1,3 +1,3 @@
+ disturl="https://electronjs.org/headers"
+-target="34.2.0"
++target="34.3.2"
+ ms_build_id="11161602"
+diff --git a/build/checksums/electron.txt b/build/checksums/electron.txt
+index dcc7bf5..d390d7a 100644
+--- a/build/checksums/electron.txt
++++ b/build/checksums/electron.txt
+@@ -1,75 +1,75 @@
+-c0a187acca68906c4a6387e8fabd052cb031ace6132d60a71001d9a0e891958e *chromedriver-v34.2.0-darwin-arm64.zip
+-fa5a46d752267d8497d375e19079e8b6a8df70c234a79b2d6b48f5862e1a0abc *chromedriver-v34.2.0-darwin-x64.zip
+-61e03d4fa570976d80f740637f56192b6448a05a73d1fba9717900b29f2b1b4d *chromedriver-v34.2.0-linux-arm64.zip
+-ec774d9b1a1b828a0db1502a1017fcab1dfed99b1b6b2fd2308dd600a1efa98a *chromedriver-v34.2.0-linux-armv7l.zip
+-cc15a6e6206485a2d96649ceb60509b9da04fa2811c4824b2e0eb43d1f4b1417 *chromedriver-v34.2.0-linux-x64.zip
+-9777122f6684180ef375b9b21dcabbc731d8a8befa300d1d47ad954a5b64c1c8 *chromedriver-v34.2.0-mas-arm64.zip
+-69451fa148b105fec9644646b22ca758a206499574c5816591354835c8056679 *chromedriver-v34.2.0-mas-x64.zip
+-eb7adc7e720f5e0f1d2c12ecbe886bdc01f2c9aaa3954bd6ebd313750bb18819 *chromedriver-v34.2.0-win32-arm64.zip
+-cb1973b0c2f5565974d5c2cb51816692f064b6cdc7897fa341d528ba7f9b14bf *chromedriver-v34.2.0-win32-ia32.zip
+-af5575b4727c3dbe7272016cbbaa8872043f843168a47d86748a50397efb4f77 *chromedriver-v34.2.0-win32-x64.zip
+-fcc718af2a28fb953290dc971e945818b4dbb293f297e6e25acb669d450cc0dd *electron-api.json
+-fa47e752e559a6472b87d8907f63296ed8cd53ecf862a4ae113018474d40aa8e *electron-v34.2.0-darwin-arm64-dsym-snapshot.zip
+-336c3374e721e2379901141be6345459f78d243b037c65b55bac4ae8cb14bfbe *electron-v34.2.0-darwin-arm64-dsym.zip
+-ac3b9d712d9f036f066d8eba42797117a513e2d250fcc117f0354300b7d5c1e5 *electron-v34.2.0-darwin-arm64-symbols.zip
+-ee447c17b2ac545e48083113d7e39a916821c1316f60f42cbcbee4fffe7c022a *electron-v34.2.0-darwin-arm64.zip
+-d7510bc038d06b26690ac9a78fbb256626502303ff7f5b1c2242f64a02832b1b *electron-v34.2.0-darwin-x64-dsym-snapshot.zip
+-0e95c2bbda00afe78e6229b824e3ffe0cc8612956dc11a5a30380224acdbecae *electron-v34.2.0-darwin-x64-dsym.zip
+-6d734ef8e8fd007071aae9a13534894dd801f11900f3e73e49cf5352b426e575 *electron-v34.2.0-darwin-x64-symbols.zip
+-8ef741819c8a5370dabc3b9df5e6ac217366477c5d5c656ed23c800bc984d887 *electron-v34.2.0-darwin-x64.zip
+-c2f448882a0392ebfd9810058a6a9580b087002c74fca3dcd3cf4ba5c3b27a7c *electron-v34.2.0-linux-arm64-debug.zip
+-51e887c382593021127593ceba89ad662d3a6de0f748b94fe3a0ce78a7393923 *electron-v34.2.0-linux-arm64-symbols.zip
+-818c91309da8ff948c43df58a996c05c0d27daa690e1d659355d9db01e351919 *electron-v34.2.0-linux-arm64.zip
+-c2f448882a0392ebfd9810058a6a9580b087002c74fca3dcd3cf4ba5c3b27a7c *electron-v34.2.0-linux-armv7l-debug.zip
+-71ec2b7473db766194bcf04648229c4affedce06e150e692745cc72dbc3749c5 *electron-v34.2.0-linux-armv7l-symbols.zip
+-0c75996c6bf2d37d0441d3e1021386a9348f8d21783d75571cdb10ede606424f *electron-v34.2.0-linux-armv7l.zip
+-d1f17be8df8ec6dc1a23afd8a7752f0b949c755a493b8a2c1e83f76c629258ca *electron-v34.2.0-linux-x64-debug.zip
+-d8fa79154b0b663dbd0054d69f53aec326997449ef21943d27225a2d6899660f *electron-v34.2.0-linux-x64-symbols.zip
+-f12a02d86cc657500978d263ec6d1841b6e2085cd3bd4d30a97cfe14685396f3 *electron-v34.2.0-linux-x64.zip
+-71ef8bfebb8513a405fd2beb44ad18f802bbac2248f81a5328ddaaa12906d70c *electron-v34.2.0-mas-arm64-dsym-snapshot.zip
+-437aca6cad3158f15fd852e5913462637052940f812b20ccc10fccc133d5a0d6 *electron-v34.2.0-mas-arm64-dsym.zip
+-7f253375a7b43d34b770c03153e47185be7a64bc0c10a783993a93144eb35492 *electron-v34.2.0-mas-arm64-symbols.zip
+-1f601c20430b036b485c7dc02a39a297f0d08905462a4568306c12f299375e2f *electron-v34.2.0-mas-arm64.zip
+-d32664181804a17f825bf1fbfd8f0cbe01e0b41b284937359e6d9754b3481ed8 *electron-v34.2.0-mas-x64-dsym-snapshot.zip
+-f6b394b89fb77dfeefdf525739fe8cd9695f8c2ac2251ed7c571a376cde059e9 *electron-v34.2.0-mas-x64-dsym.zip
+-539328d93e9bc122e6e34faeab6a42f4845c523f796c7a11bbdcfe5e856f6b98 *electron-v34.2.0-mas-x64-symbols.zip
+-749b6ced7a9d35a719ad98d4c3bf1a08c315c19ce97d2497235d4ac302cda665 *electron-v34.2.0-mas-x64.zip
+-e843ea4cb7a93686728d056c957c124760886167932ff619b518e45917edf38a *electron-v34.2.0-win32-arm64-pdb.zip
+-4908423be5f8ad1b5dd737edfd69ee0870460e16bb639bb963b0981bda2628e4 *electron-v34.2.0-win32-arm64-symbols.zip
+-9d13b2bd61416eec28f43faa399cc5c0dc9e36dec226314bbf397828f55d74de *electron-v34.2.0-win32-arm64-toolchain-profile.zip
+-1629cec7b5620e6ca3b5305c393ae147d1a3871a8f164d686b7bee3810fc1109 *electron-v34.2.0-win32-arm64.zip
+-e7182f1ef5ed13187fe12f35133cefb50c59e1d52ada758cbb72813dda575205 *electron-v34.2.0-win32-ia32-pdb.zip
+-a10f778f62bf060a7e38f5ea75ea472679b9ef4f12767ee0703e6d77effae78a *electron-v34.2.0-win32-ia32-symbols.zip
+-9d13b2bd61416eec28f43faa399cc5c0dc9e36dec226314bbf397828f55d74de *electron-v34.2.0-win32-ia32-toolchain-profile.zip
+-96396712a0240f04471f71246b3885a513b08e3f2d40154272d34e59419db7e6 *electron-v34.2.0-win32-ia32.zip
+-0c55ef5b1a6ea4604e3f0e9f8b5e946944abd1cfc3b974432d40e924a9996812 *electron-v34.2.0-win32-x64-pdb.zip
+-d6b67cf12edabcc62ae21e7c90ac6b1161dbefe4e6b765c69fc7040096b7d026 *electron-v34.2.0-win32-x64-symbols.zip
+-9d13b2bd61416eec28f43faa399cc5c0dc9e36dec226314bbf397828f55d74de *electron-v34.2.0-win32-x64-toolchain-profile.zip
+-a4fdf617dca787b7f1c6f8d0d1cb69c8adb37ee23f9553fe69803f9cad713360 *electron-v34.2.0-win32-x64.zip
+-5ca44a4ee9cc74a56c9556ce3f3774986dbb8b4f4953088c7f4577bfba4356a8 *electron.d.ts
+-86247a6815cc98f321374edcbfc0ab7ee79bcb13a5c25213f42151e4059ec690 *ffmpeg-v34.2.0-darwin-arm64.zip
+-e94f4707a91194f97d0451f9d5a27982c873a5c13d83d20926ce6fdb613f536c *ffmpeg-v34.2.0-darwin-x64.zip
+-947d7b7cb035eab94cc15b602dfa8a925cf238c1d9225c01732fe0c41f59c571 *ffmpeg-v34.2.0-linux-arm64.zip
+-64d74b6b94ac4fd755b97e0ec8d50af9cd73810fdb52f6c081b13a3337ace0ea *ffmpeg-v34.2.0-linux-armv7l.zip
+-a62cb20c5e5f2ba6f1df6f1bc406cc30f7ed44fe6380b506afa333d1b4ad7a87 *ffmpeg-v34.2.0-linux-x64.zip
+-715bbb3d193b1ca57d4b329edd05cd6b125dc188cdb73d1c66f220f62c8562e3 *ffmpeg-v34.2.0-mas-arm64.zip
+-866bf47106e8c3e50f046783eb8f5c756069c6de962a46f4edc7a5ee7e4593ee *ffmpeg-v34.2.0-mas-x64.zip
+-71a2a6c4cca15ccbcbf8912f5d73f855b0ca79804f941f68527ae808f8163957 *ffmpeg-v34.2.0-win32-arm64.zip
+-399f841cca166781078ca42c8ea060e3d5850ec6cb79716186d0806f3ce20842 *ffmpeg-v34.2.0-win32-ia32.zip
+-afad2a44f20a0c0c01fb1fea637f3f821842399593c9961c74d650ca12d32cbb *ffmpeg-v34.2.0-win32-x64.zip
+-c95fdc9dba05aa68aeccb69d4c34f0cb1fb98d7f5291d974d0b638488693655f *hunspell_dictionaries.zip
+-0abe74138afdb6e45a085d77407659f13c75ab96f694313d4e98bd662f9c6df2 *libcxx-objects-v34.2.0-linux-arm64.zip
+-3d0cbf6fb150b006428eab78235856d2204d5e93ca85f162e429b4c8bd9b0d3b *libcxx-objects-v34.2.0-linux-armv7l.zip
+-3a5491e32cec825499919be1b8bf0550d28fe5a31ff00a95572d49a58bb4820a *libcxx-objects-v34.2.0-linux-x64.zip
+-ff8753d52f759041b8e5462125ee2b96798fe8b5047f8fb8ae60cd07af2fb13d *libcxx_headers.zip
+-c98cce0091681bc367a48f66c5f4602961aa9cb6dd1a995d8969d6b39ce732f3 *libcxxabi_headers.zip
+-78a9606190fb227460ddcd276ad540873595d6a82fd1007f42900f53347e3eb1 *mksnapshot-v34.2.0-darwin-arm64.zip
+-6d4587a36f509356a908b6752de527cfe8a294a2d435b82ea3a98288c3a3a178 *mksnapshot-v34.2.0-darwin-x64.zip
+-17737bd34f7feefc5143b745f2c4f0e5a41678780e144eb43de41f8d4b9d7852 *mksnapshot-v34.2.0-linux-arm64-x64.zip
+-565aa9a84d913b7b5eb8d3b868cff151cb8a6c16548233ffd92b2f9bf3789227 *mksnapshot-v34.2.0-linux-armv7l-x64.zip
+-7332d7864ab4e5ee7fa8d00580d9357f30d0e69d3d1434d67c61f79f666314a4 *mksnapshot-v34.2.0-linux-x64.zip
+-cc81bfc9894378a9fc8a777429e04cc80860663b3dff8eba1f8cc72559a4f23d *mksnapshot-v34.2.0-mas-arm64.zip
+-c98230088698638159f6e7e0c5ddde3cb4dba9fa81d76e3c58fc86f96b63ef81 *mksnapshot-v34.2.0-mas-x64.zip
+-cc7b42943d998e1083ad8119dc2201dd27d709c15aa2a9b78f409485d2927592 *mksnapshot-v34.2.0-win32-arm64-x64.zip
+-ade9e3126f113318e226f9bdeba068b4383b30a98517a361386eff448459effa *mksnapshot-v34.2.0-win32-ia32.zip
+-344292ea318dc0e21f37bc7c82d57a57449f0fb278d9868f1b1b597bdcb1f36f *mksnapshot-v34.2.0-win32-x64.zip
++c9b82c9f381742e839fea00aeb14f24519bcaf38a0f4eed25532191701f9535b *chromedriver-v34.3.2-darwin-arm64.zip
++d556c1e2b06f1bf131e83c2fb981de755c28e1083a884d257eb964815be16b0c *chromedriver-v34.3.2-darwin-x64.zip
++1cabad4f3303ac2ff172a9f22185f64944dbaa6fc68271609077158eaefdee35 *chromedriver-v34.3.2-linux-arm64.zip
++4213ce52c72ef414179b5c5c22ae8423847ff030d438296bd6c2aac763930a7b *chromedriver-v34.3.2-linux-armv7l.zip
++3c64c08221fdfc0f4be60ea8b1b126f2ecca45f60001b63778522f711022c6ea *chromedriver-v34.3.2-linux-x64.zip
++e8388734d88e011cb6cd79795431de9206820749219d80565ee49d90501d2bf3 *chromedriver-v34.3.2-mas-arm64.zip
++3ad1dd37bd6e0bb37e8503898db7aedd56bd5213e6d6760b05c3d11f4625062b *chromedriver-v34.3.2-mas-x64.zip
++d567b481a0f5d88e84bba7718f89fb08f56363bfc4cb5914e1c2086358a5c252 *chromedriver-v34.3.2-win32-arm64.zip
++df6732e9dc61cb20a3c0b2a2de453aac7e2bd54e7cbff43512afa614852c15fa *chromedriver-v34.3.2-win32-ia32.zip
++dda0765c8d064924632e18cd152014ecd767f3808fc51c8249a053bfb7ca70a2 *chromedriver-v34.3.2-win32-x64.zip
++1945f15caff98f2e0f1ee539c483d352fb8d4d0c13f342caa7abe247676d828c *electron-api.json
++c078bbf727b3c3026f60e07a0f4643b85c06c581b54be017d0a6c284ba6772d3 *electron-v34.3.2-darwin-arm64-dsym-snapshot.zip
++35f587754d6a3272606258386bf73688d63dd53c7e572d3a7cbaae6f3f60bdae *electron-v34.3.2-darwin-arm64-dsym.zip
++08b14ee02c98353de3c738120dfd017322666e82b914a7f6de9b9888dcc5c0f0 *electron-v34.3.2-darwin-arm64-symbols.zip
++2a4aa7e8fa30f229e465ebd18d3e4722e2b41529dc51a68a954d333a7e556ffe *electron-v34.3.2-darwin-arm64.zip
++1509ccdeb80024f5e3edd5ecf804b4cef4e47ea2bd74e33ef0b39044b0ccf892 *electron-v34.3.2-darwin-x64-dsym-snapshot.zip
++3bbe5d587c3f582ed8c126b0fb635cc02ad9a14d077b04892fe6f862092445b0 *electron-v34.3.2-darwin-x64-dsym.zip
++fa7ece82e6ecaf1c94ed341e8ebff98e64687c68fe113f52cd9a21400302e22f *electron-v34.3.2-darwin-x64-symbols.zip
++23938c62257a65a863ed7aa7c7966ba5f257a7d3dc16c78293e826962cc39c5c *electron-v34.3.2-darwin-x64.zip
++0547eecf8ab538d74fa854f591ce8b888a3dbb339256d2db3038e7bb2c6dd929 *electron-v34.3.2-linux-arm64-debug.zip
++676d0dc2b1c1c85c8b2abbb8cd5376ee22ecdb910493b910d9ae5a998532136a *electron-v34.3.2-linux-arm64-symbols.zip
++774e4ccb39d553e5487994a9f8c60774a90f08cdb049ff65f3963fc27c969ff2 *electron-v34.3.2-linux-arm64.zip
++0547eecf8ab538d74fa854f591ce8b888a3dbb339256d2db3038e7bb2c6dd929 *electron-v34.3.2-linux-armv7l-debug.zip
++ba33bf53fcb35dea568a2795f5b23ecf46c218abe8258946611c72a1f42f716c *electron-v34.3.2-linux-armv7l-symbols.zip
++73ae92c8fffb351d3a455569cf57ce9a3f676f42bf61939c613c607fe0fc3bfb *electron-v34.3.2-linux-armv7l.zip
++e61a9a69dd7ea6f2687708a8e83516670cdea53c728226e598e2f6f1fad5b77b *electron-v34.3.2-linux-x64-debug.zip
++f1a04df7fe67dd1cd29e7b87871525458d2eb24c0cf3b5835a1c56974707562a *electron-v34.3.2-linux-x64-symbols.zip
++7b74c0c4fae82e27c7e9cbca13e9763e046113dba8737d3e27de9a0b300ac87e *electron-v34.3.2-linux-x64.zip
++8571a6aa83e00925ceb39fdc5a45a9f6b9aa3d92fd84951c6f252ed723aea4ae *electron-v34.3.2-mas-arm64-dsym-snapshot.zip
++477410c6f9a6c5eeaedf376058a02c2996fc0a334aa40eeec7d3734c09347f4d *electron-v34.3.2-mas-arm64-dsym.zip
++c2e62dcd6630cb51b2d8e2869e74e47d29bda785521cea6e82e546d0fc58aabb *electron-v34.3.2-mas-arm64-symbols.zip
++a1698e8546a062fd59b7f8e5507a7f3220fb00b347f2377de83fc9a07f7f3507 *electron-v34.3.2-mas-arm64.zip
++741a24ac230a3651dca81d211f9f00b835c428a5ed0c5f67d370d4e88b62f8d6 *electron-v34.3.2-mas-x64-dsym-snapshot.zip
++aeff97ec9e5c9e173ac89e38acd94476025c5640d5f27be1e8c2abd54398bab3 *electron-v34.3.2-mas-x64-dsym.zip
++9f14b66b1d612ac66697288e8763171c388f7f200854871a5f0ab464a6a921c2 *electron-v34.3.2-mas-x64-symbols.zip
++c979d7e7175f1e8e03ca187997d4c156b878189fc3611b347fadebcb16f3e027 *electron-v34.3.2-mas-x64.zip
++f43c700641e8220205dd356952e32718d113cf530520c4ed7209b59851eac266 *electron-v34.3.2-win32-arm64-pdb.zip
++3ba6e01c99bffac6b5dd3fd6f122ecdb571cf6f675dc5498c65050bd7a382ef8 *electron-v34.3.2-win32-arm64-symbols.zip
++c23f84aabb09c24cd2ae759a547fdba4206af19a3bb0f4554a91cd9528648ad0 *electron-v34.3.2-win32-arm64-toolchain-profile.zip
++9b9cb65d75a16782088b492f9ef3bb4d27525012b819c12bf29bd27e159d749b *electron-v34.3.2-win32-arm64.zip
++1006e7af4c149114b5ebc3497617aaa6cd1bb0b131e0a225fd73709ff308f9c5 *electron-v34.3.2-win32-ia32-pdb.zip
++1ecb6430cd04454f08f557c9579163f3552144bfcc0b67b768dad8868b5b891d *electron-v34.3.2-win32-ia32-symbols.zip
++c23f84aabb09c24cd2ae759a547fdba4206af19a3bb0f4554a91cd9528648ad0 *electron-v34.3.2-win32-ia32-toolchain-profile.zip
++d004fd5f853754001fafaec33e383d1950b30c935ee71b297ec1c9e084355e9b *electron-v34.3.2-win32-ia32.zip
++4e0721552fd2f09e9466e88089af8b965f1bfbc4ae00a59aaf6245b1d1efabfd *electron-v34.3.2-win32-x64-pdb.zip
++9dea812a7e7cd0fb18e5fed9a99db5531959a068c24d3c0ecedceb644cd3ffa0 *electron-v34.3.2-win32-x64-symbols.zip
++c23f84aabb09c24cd2ae759a547fdba4206af19a3bb0f4554a91cd9528648ad0 *electron-v34.3.2-win32-x64-toolchain-profile.zip
++1785e161420fb90d2331c26e50bba3413cae9625b7db3c8524ea02ade631efba *electron-v34.3.2-win32-x64.zip
++722b304c31ddac58b0083d94a241c5276464f04bd8ea4fcbfd33051d197be103 *electron.d.ts
++31ce159b2e47d1de5bc907d8e1c89726b0f2ba530ec2e9d7a8e5c723b1ccf6e0 *ffmpeg-v34.3.2-darwin-arm64.zip
++565539bac64a6ee9cf6f188070f520210a1507341718f5dc388ac7c454b1e1d5 *ffmpeg-v34.3.2-darwin-x64.zip
++6006ea0f46ab229feb2685be086b0fafd65981e2939dd2218a078459c75ab527 *ffmpeg-v34.3.2-linux-arm64.zip
++9404ce2e85df7c40f809f2cf62c7af607de299839fe6b7ae978c3015500abcc8 *ffmpeg-v34.3.2-linux-armv7l.zip
++79aec96898b7e2462826780ee0b52b9ab299dc662af333e128a34fd5ddae87f1 *ffmpeg-v34.3.2-linux-x64.zip
++9190743c78210574faf5d5ecb82a00f8fa15e5f2253378cb925a99ca9d39961b *ffmpeg-v34.3.2-mas-arm64.zip
++48915adcb1a6342efeda896035101300f0432c0304cfb38f2378e98c6309ebae *ffmpeg-v34.3.2-mas-x64.zip
++745d5ef786de6d4a720475079836e2fda7b501cfcd255819485a47de5b24b74e *ffmpeg-v34.3.2-win32-arm64.zip
++d0d86d60978439dc8ae4a723d4e4c1f853891d596bfd84033440a232fa762e2f *ffmpeg-v34.3.2-win32-ia32.zip
++4441539fd8c9cbe79880ff1bade9bdc0c3744c33d7409130af6404e57ee401ff *ffmpeg-v34.3.2-win32-x64.zip
++39edd1eeefe881aa75af0e438204e0b1c6e6724e34fa5819109276331c0c2c9a *hunspell_dictionaries.zip
++20dd417536e5f4ebc01f480221284c0673729c27b082bc04e2922f16cd571719 *libcxx-objects-v34.3.2-linux-arm64.zip
++7e53c5779c04f895f8282c0450ec4a63074d15a0e910e41006cfea133d0288af *libcxx-objects-v34.3.2-linux-armv7l.zip
++92e2283c924ab523ffec3ea22513beaab6417f7fc3d570f57d51a1e1ceb7f510 *libcxx-objects-v34.3.2-linux-x64.zip
++9bf3c6e8ad68f523fe086fada4148dd04e5bb0b9290d104873e66f2584a5cf50 *libcxx_headers.zip
++34e4b44f9c5e08b557a2caed55456ce7690abab910196a783a2a47b58d2b9ac9 *libcxxabi_headers.zip
++11f67635e6659f9188198e4086c51b89890b61a22f6c17c99eff35595ee8f51d *mksnapshot-v34.3.2-darwin-arm64.zip
++c0add9ef4ac27c73fa043d04b4c9635fd3fd9f5c16d7a03e961864ba05252813 *mksnapshot-v34.3.2-darwin-x64.zip
++6262adf86a340d8d28059937b01ef1117b93212e945fddbceea5c18d7e7c64f0 *mksnapshot-v34.3.2-linux-arm64-x64.zip
++f7db8ebe91a1cc8d24ef6aad12949a18d8e4975ac296e3e5e9ecd88c9bccb143 *mksnapshot-v34.3.2-linux-armv7l-x64.zip
++6642038e86bda362980ff1c8973a404e2b02efdd87de9e35b650fc1e743833da *mksnapshot-v34.3.2-linux-x64.zip
++15883bf8e8cd737c3682d1e719d7cbac92f50b525681aac324dca876861dfc7d *mksnapshot-v34.3.2-mas-arm64.zip
++4da23a950bfcc377ef21c37d496017ab4c36da03f3b41049ac114042c42608ce *mksnapshot-v34.3.2-mas-x64.zip
++fab59573d3c2f9bdf31146a1896d24ac0c51f736aad86d2f3c7ecef13c05a7fd *mksnapshot-v34.3.2-win32-arm64-x64.zip
++66f25e07c6f8d5d2009577a129440255a3baf63c929a5b60b2e77cd52e46105b *mksnapshot-v34.3.2-win32-ia32.zip
++8168bfbf61882cfac80aed1e71e364e1c7f2fccd11eac298e6abade8b46894ea *mksnapshot-v34.3.2-win32-x64.zip
+diff --git a/package-lock.json b/package-lock.json
+index bdf4631..1691dae 100644
+--- a/package-lock.json
++++ b/package-lock.json
+@@ -98,3 +98,3 @@
+         "deemon": "^1.8.0",
+-        "electron": "34.2.0",
++        "electron": "34.3.2",
+         "eslint": "^9.11.1",
+@@ -6101,5 +6101,5 @@
+     "node_modules/electron": {
+-      "version": "34.2.0",
+-      "resolved": "https://registry.npmjs.org/electron/-/electron-34.2.0.tgz",
+-      "integrity": "sha512-SYwBJNeXBTm1q/ErybQMUBZAYqEreBUqBwTrNkw1rV4YatDZk5Aittpcus3PPeC4UoI/tqmJ946uG8AKHTd6CA==",
++      "version": "34.3.2",
++      "resolved": "https://registry.npmjs.org/electron/-/electron-34.3.2.tgz",
++      "integrity": "sha512-n9tzmFexVLxipZXwMTY30H10f0X9k2OP0SkpSwL5VvnDZi0l/Hc+8CEArKkQPbbSf/IS7nxgc96gtTaR+XoSBg==",
+       "dev": true,
+diff --git a/package.json b/package.json
+index 7aab481..4ddc6f0 100644
+--- a/package.json
++++ b/package.json
+@@ -156,3 +156,3 @@
+     "deemon": "^1.8.0",
+-    "electron": "34.2.0",
++    "electron": "34.3.2",
+     "eslint": "^9.11.1",

patches/update-msi.patch

@@ -1,64 +0,0 @@
-diff --git a/src/vs/platform/update/common/update.ts b/src/vs/platform/update/common/update.ts
-index 7cd4a84..7cbdf21 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 d45291e..4d8c5df 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;
-+		}
- 	}
-@@ -89,6 +93,13 @@ export class Win32UpdateService extends AbstractUpdateService {
- 
--		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';
-+				}
- 		}
-@@ -243,6 +254,14 @@ export class Win32UpdateService extends AbstractUpdateService {
- 		} 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/use-github-pat.patch

@@ -33,29 +33,3 @@ index ebc4749..18fd732 100644
 +export function isHostedGitHubEnterprise(_uri: Uri): boolean {
 +	return false;
  }
-diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts b/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
-index d09cfa0..dacbde5 100644
---- a/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
-+++ b/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
-@@ -356,3 +356,3 @@ export class AccountsActivityActionViewItem extends MenuActivityActionViewItem {
- 
--		if (providers.length && !menus.length) {
-+		if (!menus.length) {
- 			const noAccountsAvailableAction = disposables.add(new Action('noAccountsAvailable', localize('noAccounts', "You are not signed in to any accounts"), undefined, false));
-diff --git a/src/vs/workbench/services/authentication/browser/authenticationService.ts b/src/vs/workbench/services/authentication/browser/authenticationService.ts
-index f6c2f14..aa27b28 100644
---- a/src/vs/workbench/services/authentication/browser/authenticationService.ts
-+++ b/src/vs/workbench/services/authentication/browser/authenticationService.ts
-@@ -284,12 +284,2 @@ export class AuthenticationService extends Disposable implements IAuthentication
- 		}
--
--		if (!this._authenticationProviders.size) {
--			placeholderMenuItem = MenuRegistry.appendMenuItem(MenuId.AccountsContext, {
--				command: {
--					id: 'noAuthenticationProviders',
--					title: nls.localize('loading', "Loading..."),
--					precondition: ContextKeyExpr.false()
--				},
--			});
--		}
- 	}

patches/version-0-release.patch

@@ -1,86 +1,79 @@
 diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
-index 2a0c236..9fea722 100644
+index e0df76f..04354d8 100644
 --- a/build/gulpfile.reh.js
 +++ b/build/gulpfile.reh.js
-@@ -250,4 +250,5 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
+@@ -310,2 +310,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
  		const name = product.nameShort;
 +		const release = packageJson.release;
+ 
+@@ -313,3 +314,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 }));
- 
-@@ -256,3 +257,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) {
+@@ -321,3 +322,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 0ca2cfd..3fb21d5 100644
+index a63f693..62e0080 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -225,3 +225,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;
-@@ -233,3 +233,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 };
  
-@@ -244,3 +245,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 90f75cc..275c958 100644
+index fb0e5a4..170c60b 100644
 --- a/build/gulpfile.vscode.linux.js
 +++ b/build/gulpfile.vscode.linux.js
-@@ -25,4 +25,2 @@ const commit = getVersion(root);
+@@ -27,4 +27,2 @@ const commit = getVersion(root);
  
 -const linuxPackageRevision = Math.floor(new Date().getTime() / 1000);
 -
  /**
-@@ -88,3 +86,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))
-@@ -193,4 +191,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))
-@@ -267,3 +264,3 @@ function prepareSnapPackage(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))
+@@ -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 6e9a6f3..9d80b6b 100644
+index 98175f5..afacbe3 100644
 --- a/build/gulpfile.vscode.win32.js
 +++ b/build/gulpfile.vscode.win32.js
-@@ -94,4 +94,4 @@ function buildWin32Setup(arch, target) {
+@@ -89,4 +89,4 @@ function buildWin32Setup(arch, target) {
  			DirName: product.win32DirName,
 -			Version: pkg.version,
 -			RawVersion: pkg.version.replace(/-\w+$/, ''),
 +			Version: `${pkg.version}.${pkg.release}`,
 +			RawVersion: `${pkg.version.replace(/-\w+$/, '')}.${pkg.release}`,
  			NameVersion: product.win32NameVersion + (target === 'user' ? ' (User)' : ''),
-diff --git a/resources/linux/rpm/code.spec.template b/resources/linux/rpm/code.spec.template
-index 06b8549..3af1f45 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@@.el7
-+Release:  el7
- Summary:  Code editing. Redefined.
 diff --git a/src/vs/base/common/product.ts b/src/vs/base/common/product.ts
-index ac9cd5d..87b6105 100644
+index 52c4c94..00fc9f8 100644
 --- a/src/vs/base/common/product.ts
 +++ b/src/vs/base/common/product.ts
 @@ -58,2 +58,3 @@ export interface IProductConfiguration {
@@ -88,16 +81,16 @@ index ac9cd5d..87b6105 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 51a55e1..26dfe7b 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) {
@@ -111,30 +104,30 @@ index 51a55e1..26dfe7b 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 4b320bb..6619c75 100644
+index 7563b30..0873839 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 { IOpenerService } from '../../../../platform/opener/common/opener.js';
++import { getReleaseString } from '../../../../workbench/common/release.js';
  
-@@ -79,2 +80,4 @@ export class BrowserDialogHandler extends AbstractDialogHandler {
+@@ -81,2 +82,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 {
+@@ -87,3 +90,3 @@ export class BrowserDialogHandler extends AbstractDialogHandler {
  				navigator.userAgent
 -			);
 +			).replace('\n', `\n${releaseString} ${this.productService.release || 'Unknown'}\n`);
  		};
 diff --git a/src/vs/workbench/common/release.ts b/src/vs/workbench/common/release.ts
 new file mode 100644
-index 0000000..2a8ea57
+index 0000000..82dbe6a
 --- /dev/null
 +++ b/src/vs/workbench/common/release.ts
 @@ -0,0 +1,14 @@
-+import { language } from 'vs/base/common/platform';
++import { language } from '../../base/common/platform.js';
 +
 +const DEFAULT_LABEL = 'Release:';
 +const LABELS: { [key: string]: string } = {
@@ -149,18 +142,18 @@ 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 575bde3..f427833 100644
+index 6c61a59..d58f8fc 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';
+@@ -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.js';
  
-@@ -77,2 +78,3 @@ export class NativeDialogHandler extends AbstractDialogHandler {
+@@ -80,2 +81,3 @@ export class NativeDialogHandler extends AbstractDialogHandler {
  		const osProps = await this.nativeHostService.getOSProperties();
 +		const releaseString = getReleaseString();
  
-@@ -89,3 +91,3 @@ export class NativeDialogHandler extends AbstractDialogHandler {
+@@ -93,3 +95,3 @@ export class NativeDialogHandler extends AbstractDialogHandler {
  				`${osProps.type} ${osProps.arch} ${osProps.release}${isLinuxSnap ? ' snap' : ''}`
 -			);
 +			).replace('\n', `\n${releaseString} ${this.productService.release || 'Unknown'}\n`);

patches/version-1-update.patch

@@ -0,0 +1,234 @@
+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 a1ec3fe..f954720 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 57398fb..8e36930 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 } 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 dd18900..920dc10 100644
+--- a/src/vs/platform/update/electron-main/updateService.linux.ts
++++ b/src/vs/platform/update/electron-main/updateService.linux.ts
+@@ -31,3 +31,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 db92de2..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 } 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);
+ 	}
+@@ -130,2 +145,10 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
+ 
++				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));
++					return Promise.resolve(null);
++				}
++
+ 				if (updateType === UpdateType.Archive) {
+@@ -156,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) {
+@@ -168,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);
+@@ -252,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']
++				});
++			}
+ 		}

patches/windows/policies.patch

@@ -0,0 +1,258 @@
+diff --git a/build/.moduleignore b/build/.moduleignore
+index 6b7f365..2211e6e 100644
+--- a/build/.moduleignore
++++ b/build/.moduleignore
+@@ -125,9 +125,11 @@ vsda/**
+ 
+-@vscode/policy-watcher/build/**
+-@vscode/policy-watcher/.husky/**
+-@vscode/policy-watcher/src/**
+-@vscode/policy-watcher/binding.gyp
+-@vscode/policy-watcher/README.md
+-@vscode/policy-watcher/index.d.ts
+-!@vscode/policy-watcher/build/Release/vscode-policy-watcher.node
++@vscodium/policy-watcher/.github/**
++@vscodium/policy-watcher/.husky/**
++@vscodium/policy-watcher/build/**
++@vscodium/policy-watcher/src/**
++@vscodium/policy-watcher/.release-it.yml
++@vscodium/policy-watcher/binding.gyp
++@vscodium/policy-watcher/README.md
++@vscodium/policy-watcher/index.d.ts
++!@vscodium/policy-watcher/build/Release/vscode-policy-watcher.node
+ 
+diff --git a/build/lib/policies.js b/build/lib/policies.js
+index b76d9ff..a84f490 100644
+--- a/build/lib/policies.js
++++ b/build/lib/policies.js
+@@ -64,3 +64,3 @@ class BasePolicy {
+         return [
+-            `<policy name="${this.name}" class="Both" displayName="$(string.${this.name})" explainText="$(string.${this.name}_${this.description.nlsKey.replace(/\./g, '_')})" key="Software\\Policies\\Microsoft\\${regKey}" presentation="$(presentation.${this.name})">`,
++            `<policy name="${this.name}" class="Both" displayName="$(string.${this.name})" explainText="$(string.${this.name}_${this.description.nlsKey.replace(/\./g, '_')})" key="Software\\Policies\\!!ORG_NAME!!\\${regKey}" presentation="$(presentation.${this.name})">`,
+             `	<parentCategory ref="${this.category.name.nlsKey}" />`,
+@@ -376,3 +376,3 @@ function renderADMX(regKey, versions, categories, policies) {
+ 	<policyNamespaces>
+-		<target prefix="${regKey}" namespace="Microsoft.Policies.${regKey}" />
++		<target prefix="${regKey}" namespace="!!ORG_NAME!!.Policies.${regKey}" />
+ 	</policyNamespaces>
+diff --git a/build/lib/policies.ts b/build/lib/policies.ts
+index 2488920..8b268ce 100644
+--- a/build/lib/policies.ts
++++ b/build/lib/policies.ts
+@@ -80,3 +80,3 @@ abstract class BasePolicy implements Policy {
+ 		return [
+-			`<policy name="${this.name}" class="Both" displayName="$(string.${this.name})" explainText="$(string.${this.name}_${this.description.nlsKey.replace(/\./g, '_')})" key="Software\\Policies\\Microsoft\\${regKey}" presentation="$(presentation.${this.name})">`,
++			`<policy name="${this.name}" class="Both" displayName="$(string.${this.name})" explainText="$(string.${this.name}_${this.description.nlsKey.replace(/\./g, '_')})" key="Software\\Policies\\!!ORG_NAME!!\\${regKey}" presentation="$(presentation.${this.name})">`,
+ 			`	<parentCategory ref="${this.category.name.nlsKey}" />`,
+@@ -553,3 +553,3 @@ function renderADMX(regKey: string, versions: string[], categories: Category[],
+ 	<policyNamespaces>
+-		<target prefix="${regKey}" namespace="Microsoft.Policies.${regKey}" />
++		<target prefix="${regKey}" namespace="!!ORG_NAME!!.Policies.${regKey}" />
+ 	</policyNamespaces>
+diff --git a/eslint.config.js b/eslint.config.js
+index 8e3d288..1fa7cc3 100644
+--- a/eslint.config.js
++++ b/eslint.config.js
+@@ -793,3 +793,3 @@ export default tseslint.config(
+ 						'@vscode/iconv-lite-umd',
+-						'@vscode/policy-watcher',
++						'@vscodium/policy-watcher',
+ 						'@vscode/proxy-agent',
+diff --git a/package-lock.json b/package-lock.json
+index d4bc1fb..195cbe1 100644
+--- a/package-lock.json
++++ b/package-lock.json
+@@ -18,3 +18,2 @@
+         "@vscode/iconv-lite-umd": "0.7.0",
+-        "@vscode/policy-watcher": "^1.1.10",
+         "@vscode/proxy-agent": "^0.32.0",
+@@ -29,2 +28,3 @@
+         "@vscode/windows-registry": "^1.1.0",
++        "@vscodium/policy-watcher": "^1.1.10-2503041159",
+         "@xterm/addon-clipboard": "^0.2.0-beta.81",
+@@ -2831,22 +2831,2 @@
+     },
+-    "node_modules/@vscode/policy-watcher": {
+-      "version": "1.1.10",
+-      "resolved": "https://registry.npmjs.org/@vscode/policy-watcher/-/policy-watcher-1.1.10.tgz",
+-      "integrity": "sha512-erRJiryjhP//MnRZo+j0LxjVSFa4eZMR9HeAGxIuxlZCQrnvrIG5nv/4qBxiMH0+uE4Z74YY/Ct0wus6l9U/xg==",
+-      "hasInstallScript": true,
+-      "license": "MIT",
+-      "dependencies": {
+-        "bindings": "^1.5.0",
+-        "node-addon-api": "^8.2.0"
+-      }
+-    },
+-    "node_modules/@vscode/policy-watcher/node_modules/node-addon-api": {
+-      "version": "8.2.0",
+-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.2.0.tgz",
+-      "integrity": "sha512-qnyuI2ROiCkye42n9Tj5aX1ns7rzj6n7zW1XReSnLSL9v/vbLeR6fJq6PU27YU/ICfYw6W7Ouk/N7cysWu/hlw==",
+-      "license": "MIT",
+-      "engines": {
+-        "node": "^18 || ^20 || >= 21"
+-      }
+-    },
+     "node_modules/@vscode/proxy-agent": {
+@@ -3247,2 +3227,22 @@
+     },
++    "node_modules/@vscodium/policy-watcher": {
++      "version": "1.1.10-2503041159",
++      "resolved": "https://registry.npmjs.org/@vscodium/policy-watcher/-/policy-watcher-1.1.10-2503041159.tgz",
++      "integrity": "sha512-Jz8MKbNIB4nJPnr3l3xmyp1VvrkFhOlcjZDoUzQAoVuAfkovedhvPkoZkiB21ygGb4ZxU0ApJXHfzanee0ltWA==",
++      "hasInstallScript": true,
++      "license": "MIT",
++      "dependencies": {
++        "bindings": "^1.5.0",
++        "node-addon-api": "^8.2.0"
++      }
++    },
++    "node_modules/@vscodium/policy-watcher/node_modules/node-addon-api": {
++      "version": "8.3.0",
++      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.3.0.tgz",
++      "integrity": "sha512-8VOpLHFrOQlAH+qA0ZzuGRlALRA6/LVh8QJldbrC4DY0hXoMP0l4Acq8TzFC018HztWiRqyCEj2aTWY2UvnJUg==",
++      "license": "MIT",
++      "engines": {
++        "node": "^18 || ^20 || >= 21"
++      }
++    },
+     "node_modules/@webassemblyjs/ast": {
+diff --git a/package.json b/package.json
+index 925462f..c4b6304 100644
+--- a/package.json
++++ b/package.json
+@@ -76,3 +76,3 @@
+     "@vscode/iconv-lite-umd": "0.7.0",
+-    "@vscode/policy-watcher": "^1.1.10",
++    "@vscodium/policy-watcher": "^1.1.10-2503041159",
+     "@vscode/proxy-agent": "^0.32.0",
+diff --git a/src/vs/base/test/node/uri.perf.data.txt b/src/vs/base/test/node/uri.perf.data.txt
+index ee0a24b..881ce36 100644
+--- a/src/vs/base/test/node/uri.perf.data.txt
++++ b/src/vs/base/test/node/uri.perf.data.txt
+@@ -14698,48 +14698,48 @@
+ /Users/example/node_modules/@vscode/node-addon-api/node_addon_api.Makefile
+-/Users/example/node_modules/@vscode/policy-watcher/LICENSE
+-/Users/example/node_modules/@vscode/policy-watcher/binding.gyp
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/LICENSE.md
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/tools/conversion.js
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/tools/eslint-format.js
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/tools/clang-format.js
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/tools/README.md
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/tools/check-napi.js
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/except.gypi
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/napi-inl.deprecated.h
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/index.js
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/README.md
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/napi-inl.h
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/node_api.gyp
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/napi.h
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/package.json
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/noexcept.gypi
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/common.gypi
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/nothing.c
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/package-support.json
+-/Users/example/node_modules/@vscode/policy-watcher/index.js
+-/Users/example/node_modules/@vscode/policy-watcher/README.md
+-/Users/example/node_modules/@vscode/policy-watcher/package.json
+-/Users/example/node_modules/@vscode/policy-watcher/build/vscode-policy-watcher.target.mk
+-/Users/example/node_modules/@vscode/policy-watcher/build/gyp-mac-tool
+-/Users/example/node_modules/@vscode/policy-watcher/build/Makefile
+-/Users/example/node_modules/@vscode/policy-watcher/build/Release/obj.target/vscode-policy-watcher/src/main.o
+-/Users/example/node_modules/@vscode/policy-watcher/build/Release/obj.target/vscode-policy-watcher/src/macos/PolicyWatcher.o
+-/Users/example/node_modules/@vscode/policy-watcher/build/Release/vscode-policy-watcher.node
+-/Users/example/node_modules/@vscode/policy-watcher/build/Release/.deps/Release/vscode-policy-watcher.node.d
+-/Users/example/node_modules/@vscode/policy-watcher/build/Release/.deps/Release/obj.target/vscode-policy-watcher/src/macos/PolicyWatcher.o.d
+-/Users/example/node_modules/@vscode/policy-watcher/build/Release/.deps/Release/obj.target/vscode-policy-watcher/src/main.o.d
+-/Users/example/node_modules/@vscode/policy-watcher/build/config.gypi
+-/Users/example/node_modules/@vscode/policy-watcher/build/binding.Makefile
+-/Users/example/node_modules/@vscode/policy-watcher/index.d.ts
+-/Users/example/node_modules/@vscode/policy-watcher/src/main.cc
+-/Users/example/node_modules/@vscode/policy-watcher/src/macos/PolicyWatcher.cc
+-/Users/example/node_modules/@vscode/policy-watcher/src/PolicyWatcher.hh
+-/Users/example/node_modules/@vscode/policy-watcher/src/linux/PolicyWatcher.cc
+-/Users/example/node_modules/@vscode/policy-watcher/src/Policy.hh
+-/Users/example/node_modules/@vscode/policy-watcher/src/windows/RegistryPolicy.hh
+-/Users/example/node_modules/@vscode/policy-watcher/src/windows/PolicyWatcher.cc
+-/Users/example/node_modules/@vscode/policy-watcher/src/windows/NumberPolicy.cc
+-/Users/example/node_modules/@vscode/policy-watcher/src/windows/StringPolicy.hh
+-/Users/example/node_modules/@vscode/policy-watcher/src/windows/StringPolicy.cc
+-/Users/example/node_modules/@vscode/policy-watcher/src/windows/NumberPolicy.hh
++/Users/example/node_modules/@vscodium/policy-watcher/LICENSE
++/Users/example/node_modules/@vscodium/policy-watcher/binding.gyp
++/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/LICENSE.md
++/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/tools/conversion.js
++/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/tools/eslint-format.js
++/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/tools/clang-format.js
++/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/tools/README.md
++/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/tools/check-napi.js
++/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/except.gypi
++/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/napi-inl.deprecated.h
++/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/index.js
++/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/README.md
++/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/napi-inl.h
++/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/node_api.gyp
++/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/napi.h
++/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/package.json
++/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/noexcept.gypi
++/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/common.gypi
++/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/nothing.c
++/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/package-support.json
++/Users/example/node_modules/@vscodium/policy-watcher/index.js
++/Users/example/node_modules/@vscodium/policy-watcher/README.md
++/Users/example/node_modules/@vscodium/policy-watcher/package.json
++/Users/example/node_modules/@vscodium/policy-watcher/build/vscode-policy-watcher.target.mk
++/Users/example/node_modules/@vscodium/policy-watcher/build/gyp-mac-tool
++/Users/example/node_modules/@vscodium/policy-watcher/build/Makefile
++/Users/example/node_modules/@vscodium/policy-watcher/build/Release/obj.target/vscode-policy-watcher/src/main.o
++/Users/example/node_modules/@vscodium/policy-watcher/build/Release/obj.target/vscode-policy-watcher/src/macos/PolicyWatcher.o
++/Users/example/node_modules/@vscodium/policy-watcher/build/Release/vscode-policy-watcher.node
++/Users/example/node_modules/@vscodium/policy-watcher/build/Release/.deps/Release/vscode-policy-watcher.node.d
++/Users/example/node_modules/@vscodium/policy-watcher/build/Release/.deps/Release/obj.target/vscode-policy-watcher/src/macos/PolicyWatcher.o.d
++/Users/example/node_modules/@vscodium/policy-watcher/build/Release/.deps/Release/obj.target/vscode-policy-watcher/src/main.o.d
++/Users/example/node_modules/@vscodium/policy-watcher/build/config.gypi
++/Users/example/node_modules/@vscodium/policy-watcher/build/binding.Makefile
++/Users/example/node_modules/@vscodium/policy-watcher/index.d.ts
++/Users/example/node_modules/@vscodium/policy-watcher/src/main.cc
++/Users/example/node_modules/@vscodium/policy-watcher/src/macos/PolicyWatcher.cc
++/Users/example/node_modules/@vscodium/policy-watcher/src/PolicyWatcher.hh
++/Users/example/node_modules/@vscodium/policy-watcher/src/linux/PolicyWatcher.cc
++/Users/example/node_modules/@vscodium/policy-watcher/src/Policy.hh
++/Users/example/node_modules/@vscodium/policy-watcher/src/windows/RegistryPolicy.hh
++/Users/example/node_modules/@vscodium/policy-watcher/src/windows/PolicyWatcher.cc
++/Users/example/node_modules/@vscodium/policy-watcher/src/windows/NumberPolicy.cc
++/Users/example/node_modules/@vscodium/policy-watcher/src/windows/StringPolicy.hh
++/Users/example/node_modules/@vscodium/policy-watcher/src/windows/StringPolicy.cc
++/Users/example/node_modules/@vscodium/policy-watcher/src/windows/NumberPolicy.hh
+ /Users/example/node_modules/@vscode/vscode-languagedetection/CODE_OF_CONDUCT.md
+diff --git a/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts b/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts
+index e0b99f3..f3af586 100644
+--- a/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts
++++ b/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts
+@@ -62,5 +62,5 @@ flakySuite('Native Modules (all platforms)', () => {
+ 
+-	test('@vscode/policy-watcher', async () => {
+-		const watcher = await import('@vscode/policy-watcher');
+-		assert.ok(typeof watcher.createWatcher === 'function', testErrorMessage('@vscode/policy-watcher'));
++	test('@vscodium/policy-watcher', async () => {
++		const watcher = await import('@vscodium/policy-watcher');
++		assert.ok(typeof watcher.createWatcher === 'function', testErrorMessage('@vscodium/policy-watcher'));
+ 	});
+diff --git a/src/vs/platform/policy/node/nativePolicyService.ts b/src/vs/platform/policy/node/nativePolicyService.ts
+index 67f7892..5b8859c 100644
+--- a/src/vs/platform/policy/node/nativePolicyService.ts
++++ b/src/vs/platform/policy/node/nativePolicyService.ts
+@@ -8,3 +8,3 @@ import { IStringDictionary } from '../../../base/common/collections.js';
+ import { Throttler } from '../../../base/common/async.js';
+-import type { PolicyUpdate, Watcher } from '@vscode/policy-watcher';
++import type { PolicyUpdate, Watcher } from '@vscodium/policy-watcher';
+ import { MutableDisposable } from '../../../base/common/lifecycle.js';
+@@ -27,3 +27,3 @@ export class NativePolicyService extends AbstractPolicyService implements IPolic
+ 
+-		const { createWatcher } = await import('@vscode/policy-watcher');
++		const { createWatcher } = await import('@vscodium/policy-watcher');
+ 
+@@ -31,3 +31,3 @@ export class NativePolicyService extends AbstractPolicyService implements IPolic
+ 			try {
+-				this.watcher.value = createWatcher(this.productName, policyDefinitions, update => {
++				this.watcher.value = createWatcher('!!ORG_NAME!!', this.productName, policyDefinitions, update => {
+ 					this._onDidPolicyChange(update);

prepare_assets.sh

@@ -5,46 +5,61 @@ set -e
 
 APP_NAME_LC="$( echo "${APP_NAME}" | awk '{print tolower($0)}' )"
 
-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
-  if [[ "${CI_BUILD}" != "no" ]]; then
-    cd "VSCode-darwin-${VSCODE_ARCH}"
+  if [[ -n "${CERTIFICATE_OSX_P12_DATA}" ]]; then
+    if [[ "${CI_BUILD}" == "no" ]]; then
+      RUNNER_TEMP="${TMPDIR}"
+    fi
 
     CERTIFICATE_P12="${APP_NAME}.p12"
-    KEYCHAIN="${RUNNER_TEMP}/build.keychain"
+    KEYCHAIN="${RUNNER_TEMP}/buildagent.keychain"
+    AGENT_TEMPDIRECTORY="${RUNNER_TEMP}"
+    # shellcheck disable=SC2006
+    KEYCHAINS=`security list-keychains | xargs`
 
-    echo "${CERTIFICATE_OSX_P12}" | base64 --decode > "${CERTIFICATE_P12}"
+    rm -f "${KEYCHAIN}"
+
+    echo "${CERTIFICATE_OSX_P12_DATA}" | base64 --decode > "${CERTIFICATE_P12}"
 
     echo "+ create temporary keychain"
-    security create-keychain -p mysecretpassword "${KEYCHAIN}"
+    security create-keychain -p pwd "${KEYCHAIN}"
     security set-keychain-settings -lut 21600 "${KEYCHAIN}"
-    security unlock-keychain -p mysecretpassword "${KEYCHAIN}"
-    security list-keychains -s "$(security list-keychains | xargs)" "${KEYCHAIN}"
-    # security list-keychains -d user
-    # security show-keychain-info ${KEYCHAIN}
+    security unlock-keychain -p pwd "${KEYCHAIN}"
+    # shellcheck disable=SC2086
+    security list-keychains -s $KEYCHAINS "${KEYCHAIN}"
+    # security show-keychain-info "${KEYCHAIN}"
 
     echo "+ import certificate to keychain"
-    security import "${CERTIFICATE_P12}" -k "${KEYCHAIN}" -P "${CERTIFICATE_OSX_PASSWORD}" -T /usr/bin/codesign
-    security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k mysecretpassword "${KEYCHAIN}" > /dev/null
+    security import "${CERTIFICATE_P12}" -k "${KEYCHAIN}" -P "${CERTIFICATE_OSX_P12_PASSWORD}" -T /usr/bin/codesign
+    security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k pwd "${KEYCHAIN}" > /dev/null
     # security find-identity "${KEYCHAIN}"
 
+    CODESIGN_IDENTITY="$( security find-identity -v -p codesigning "${KEYCHAIN}" | grep -oEi "([0-9A-F]{40})" | head -n 1 )"
+
     echo "+ signing"
-    if [[ "${VSCODE_QUALITY}" == "insider" ]]; then
-      codesign --deep --force --verbose --sign "${CERTIFICATE_OSX_ID}" "${APP_NAME} - Insiders.app"
-    else
-      codesign --deep --force --verbose --sign "${CERTIFICATE_OSX_ID}" "${APP_NAME}.app"
-    fi
+    export CODESIGN_IDENTITY AGENT_TEMPDIRECTORY
+
+    DEBUG="electron-osx-sign*" node vscode/build/darwin/sign.js "$( pwd )"
+    # codesign --display --entitlements :- ""
+
+    echo "+ notarize"
+
+    cd "VSCode-darwin-${VSCODE_ARCH}"
+    ZIP_FILE="./${APP_NAME}-darwin-${VSCODE_ARCH}-${RELEASE_VERSION}.zip"
+
+    zip -r -X -y "${ZIP_FILE}" ./*.app
+
+    xcrun notarytool store-credentials "${APP_NAME}" --apple-id "${CERTIFICATE_OSX_ID}" --team-id "${CERTIFICATE_OSX_TEAM_ID}" --password "${CERTIFICATE_OSX_APP_PASSWORD}" --keychain "${KEYCHAIN}"
+    # xcrun notarytool history --keychain-profile "${APP_NAME}" --keychain "${KEYCHAIN}"
+    xcrun notarytool submit "${ZIP_FILE}" --keychain-profile "${APP_NAME}" --wait --keychain "${KEYCHAIN}"
+
+    echo "+ attach staple"
+    xcrun stapler staple ./*.app
+    # spctl --assess -vv --type install ./*.app
+
+    rm "${ZIP_FILE}"
 
     cd ..
   fi
@@ -59,8 +74,8 @@ if [[ "${OS_NAME}" == "osx" ]]; then
   if [[ "${SHOULD_BUILD_DMG}" != "no" ]]; then
     echo "Building and moving DMG"
     pushd "VSCode-darwin-${VSCODE_ARCH}"
-    npx create-dmg ./*.app ..
-    mv ../*.dmg "../assets/${APP_NAME}.${VSCODE_ARCH}.${RELEASE_VERSION}.dmg"
+    npx create-dmg ./*.app .
+    mv ./*.dmg "../assets/${APP_NAME}.${VSCODE_ARCH}.${RELEASE_VERSION}.dmg"
     popd
   fi
 
@@ -69,6 +84,13 @@ if [[ "${OS_NAME}" == "osx" ]]; then
     git archive --format zip --output="./assets/${APP_NAME}-${RELEASE_VERSION}-src.zip" HEAD
   fi
 
+  if [[ -n "${CERTIFICATE_OSX_P12_DATA}" ]]; then
+    echo "+ clean"
+    security delete-keychain "${KEYCHAIN}"
+    # shellcheck disable=SC2086
+    security list-keychains -s $KEYCHAINS
+  fi
+
   VSCODE_PLATFORM="darwin"
 elif [[ "${OS_NAME}" == "windows" ]]; then
   cd vscode || { echo "'vscode' dir not found"; exit 1; }
@@ -125,6 +147,10 @@ elif [[ "${OS_NAME}" == "windows" ]]; then
 else
   cd vscode || { echo "'vscode' dir not found"; exit 1; }
 
+  if [[ "${SHOULD_BUILD_APPIMAGE}" != "no" && "${VSCODE_ARCH}" != "x64" ]]; then
+    SHOULD_BUILD_APPIMAGE="no"
+  fi
+
   if [[ "${SHOULD_BUILD_DEB}" != "no" || "${SHOULD_BUILD_APPIMAGE}" != "no" ]]; then
     yarn gulp "vscode-linux-${VSCODE_ARCH}-build-deb"
   fi
@@ -139,6 +165,14 @@ else
 
   cd ..
 
+  if [[ "${CI_BUILD}" == "no" ]]; then
+    . ./stores/snapcraft/build.sh
+
+    if [[ "${SKIP_ASSETS}" == "no" ]]; then
+      mv stores/snapcraft/build/*.snap assets/
+    fi
+  fi
+
   if [[ "${SHOULD_BUILD_TAR}" != "no" ]]; then
     echo "Building and moving TAR"
     cd "VSCode-linux-${VSCODE_ARCH}"
@@ -173,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 ..