fix: remote dependencies (#1324)

.github/workflows/insider-linux.yml

@@ -6,6 +6,9 @@ on:
       release_version:
         type: string
         description: Forced release version
+      new_release:
+        type: boolean
+        description: Force new Release
   schedule:
     - cron: '0 8 * * *'
   push:
@@ -17,18 +20,108 @@ on:
     paths-ignore:
     - '**/*.md'
 
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container:
-      image: ${{ matrix.image }}
 env:
   APP_NAME: VSCodium
   ASSETS_REPOSITORY: ${{ github.repository }}-insiders
-        VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
+  GITHUB_BRANCH: insider
   OS_NAME: linux
-        VSCODE_ARCH: ${{ matrix.vscode_arch }}
+  VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
   VSCODE_QUALITY: insider
+
+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 }}
+      RELEASE_VERSION: ${{ env.RELEASE_VERSION }}
+      SHOULD_BUILD: ${{ env.SHOULD_BUILD }}
+      SHOULD_DEPLOY: ${{ env.SHOULD_DEPLOY }}
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ env.GITHUB_BRANCH }}
+
+      - name: Clone VSCode repo
+        env:
+          RELEASE_VERSION: ${{ github.event.inputs.release_version }}
+        run: ./get_repo.sh
+
+      - name: Check PR or cron
+        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:bionic-x64
+    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'
+
+      - name: Setup Node.js environment
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16
+
+      - name: Install Yarn
+        run: npm install -g yarn
+
+      - name: Install remote dependencies (x64)
+        env:
+          npm_config_arch: x64
+        run: ./install_remote_dependencies.sh
+        if: matrix.vscode_arch == 'x64'
+
+      # - name: Install remote dependencies (arm64)
+      #   run: |
+      #     set -e
+      #     docker run -e VSCODE_QUALITY -e GITHUB_TOKEN -v $(pwd):/root/vscodium vscodium/vscodium-linux-build-agent:centos7-devtoolset8-arm64 /root/vscodium/install_remote_dependencies.sh
+      #   if: matrix.vscode_arch == 'arm64'
+
+      - 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:
+      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:
@@ -42,14 +135,23 @@ jobs:
         - vscode_arch: armhf
           npm_arch: armv7l
           image: vscodium/vscodium-linux-build-agent:stretch-armhf
+    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: insider
+          ref: ${{ env.GITHUB_BRANCH }}
+
+      - name: Clone VSCode repo
+        run: ./get_repo.sh
 
       - name: Install GH
         run: ./install_gh.sh
@@ -62,37 +164,18 @@ jobs:
       - name: Install Yarn
         run: npm install -g yarn
 
-      - name: Clone VSCode repo
-        env:
-          RELEASE_VERSION: ${{ github.event.inputs.release_version }}
-        run: ./get_repo.sh
-
-      - name: Check PR or cron
-        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'
 
-      - name: Compute cache key
+      - name: Restore remote dependencies
-        id: yarnCacheKey
+        uses: actions/download-artifact@v3
-        run: echo "::set-output name=value::$(node build/azure-pipelines/computeYarnCacheKey.js)"
-        if: env.SHOULD_BUILD == 'yes'
-
-      - name: Get yarn cache directory path
-        id: yarnCacheDirPath
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-        if: env.SHOULD_BUILD == 'yes'
-
-      - name: Cache yarn directory
-        uses: actions/cache@v3
         with:
-          path: ${{ steps.yarnCacheDirPath.outputs.dir }}
+          name: remote-dependencies-${{ matrix.vscode_arch }}
-          key: linux-${{ matrix.npm_arch }}-yarnCacheDir-${{ steps.yarnCacheKey.outputs.value }}
+        if: env.SHOULD_BUILD == 'yes' && matrix.vscode_arch == 'x64'
-          restore-keys: linux-${{ matrix.npm_arch }}-yarnCacheDir-
-        if: env.SHOULD_BUILD == 'yes'
 
       - name: Build
         env:
@@ -120,41 +203,38 @@ jobs:
         if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
 
   aur:
-    needs: build
+    needs:
+      - build
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - package_name: vscodium-insiders-bin
+        - package_name: vscodium-insiders
     if: needs.build.outputs.SHOULD_DEPLOY == 'yes'
 
     steps:
       - name: Get version
         env:
           RELEASE_VERSION: ${{ needs.build.outputs.RELEASE_VERSION }}
-        run: echo "PACKAGE_VERSION=${RELEASE_VERSION/-*/}" >> $GITHUB_ENV
+        run: echo "PACKAGE_VERSION=${RELEASE_VERSION/-*/}" >> "${GITHUB_ENV}"
 
-      - name: Publish vscodium-insiders-bin
+      - name: Publish ${{ matrix.package_name }}
         uses: zokugun/github-actions-aur-releaser@v1
         with:
-          package_name: vscodium-insiders-bin
+          package_name: ${{ matrix.package_name }}
-          package_version: ${{ env.PACKAGE_VERSION }}
-          aur_private_key: ${{ secrets.AUR_PRIVATE_KEY }}
-          aur_username: ${{ secrets.AUR_USERNAME }}
-          aur_email: ${{ secrets.AUR_EMAIL }}
-
-      - name: Publish vscodium-insiders
-        uses: zokugun/github-actions-aur-releaser@v1
-        with:
-          package_name: vscodium-insiders
           package_version: ${{ env.PACKAGE_VERSION }}
           aur_private_key: ${{ secrets.AUR_PRIVATE_KEY }}
           aur_username: ${{ secrets.AUR_USERNAME }}
           aur_email: ${{ secrets.AUR_EMAIL }}
 
   snap:
-    needs: build
+    needs:
+      - build
     runs-on: ubuntu-latest
     env:
       APP_NAME: codium
-      ASSETS_REPOSITORY: ${{ github.repository }}-insiders
-      VSCODE_QUALITY: 'insider'
     strategy:
       fail-fast: false
       matrix:
@@ -162,7 +242,7 @@ jobs:
         - amd64
         - arm64
     # if: needs.build.outputs.SHOULD_DEPLOY == 'yes'
-    if: ${{ false }}
+    if: false
 
     steps:
       - uses: actions/checkout@v3

.github/workflows/insider-macos.yml

@@ -6,6 +6,9 @@ on:
       release_version:
         type: string
         description: Forced release version
+      new_release:
+        type: boolean
+        description: Force new Release
   schedule:
     - cron: '0 8 * * *'
   push:
@@ -17,16 +20,19 @@ on:
     paths-ignore:
     - '**/*.md'
 
+env:
+  APP_NAME: VSCodium
+  ASSETS_REPOSITORY: ${{ github.repository }}-insiders
+  GITHUB_BRANCH: insider
+  OS_NAME: osx
+  VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
+  VSCODE_QUALITY: insider
+
 jobs:
   build:
     runs-on: ${{ matrix.runner }}
     env:
-      APP_NAME: VSCodium
-      ASSETS_REPOSITORY: ${{ github.repository }}-insiders
-      VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
-      OS_NAME: osx
       VSCODE_ARCH: ${{ matrix.vscode_arch }}
-      VSCODE_QUALITY: insider
     strategy:
       fail-fast: false
       matrix:
@@ -57,27 +63,10 @@ jobs:
       - 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'
 
-      - name: Compute cache key
-        id: yarnCacheKey
-        run: echo "::set-output name=value::$(node build/azure-pipelines/computeYarnCacheKey.js)"
-        if: env.SHOULD_BUILD == 'yes'
-
-      - name: Get yarn cache directory path
-        id: yarnCacheDirPath
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-        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 }}

.github/workflows/insider-spearhead.yml

@@ -37,12 +37,12 @@ jobs:
 
       - name: Compute cache key
         id: yarnCacheKey
-        run: echo "::set-output name=value::$(node build/azure-pipelines/computeYarnCacheKey.js)"
+        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 "::set-output name=dir::$(yarn cache dir)"
+        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Cache yarn directory

.github/workflows/insider-windows.yml

@@ -6,6 +6,9 @@ on:
       release_version:
         type: string
         description: Forced release version
+      new_release:
+        type: boolean
+        description: Force new Release
   schedule:
     - cron: '0 8 * * *'
   push:
@@ -17,6 +20,14 @@ on:
     paths-ignore:
     - '**/*.md'
 
+env:
+  APP_NAME: VSCodium
+  ASSETS_REPOSITORY: ${{ github.repository }}-insiders
+  GITHUB_BRANCH: insider
+  OS_NAME: windows
+  VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
+  VSCODE_QUALITY: insider
+
 jobs:
   build:
     runs-on: windows-2019
@@ -24,12 +35,7 @@ jobs:
       run:
         shell: bash
     env:
-      APP_NAME: VSCodium
-      ASSETS_REPOSITORY: ${{ github.repository }}-insiders
-      VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
-      OS_NAME: windows
       VSCODE_ARCH: ${{ matrix.vscode_arch }}
-      VSCODE_QUALITY: insider
     strategy:
       fail-fast: false
       matrix:
@@ -44,7 +50,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          ref: insider
+          ref: ${{ env.GITHUB_BRANCH }}
 
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
@@ -70,27 +76,10 @@ jobs:
       - 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'
 
-      - name: Compute cache key
-        id: yarnCacheKey
-        run: echo "::set-output name=value::$(node build/azure-pipelines/computeYarnCacheKey.js)"
-        if: env.SHOULD_BUILD == 'yes'
-
-      - name: Get yarn cache directory path
-        id: yarnCacheDirPath
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-        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 }}
@@ -125,13 +114,13 @@ jobs:
         shell: bash
     env:
       APP_IDENTIFIER: VSCodium.VSCodium.Insiders
-      VSCODE_QUALITY: 'insider'
+      ASSETS_REPOSITORY: vscodium-insiders
     if: needs.build.outputs.SHOULD_DEPLOY == 'yes'
 
     steps:
       - uses: actions/checkout@v3
         with:
-          ref: insider
+          ref: ${{ env.GITHUB_BRANCH }}
 
       - name: Check version
         run: ./stores/winget/check_version.sh
@@ -143,7 +132,7 @@ jobs:
         with:
           identifier: ${{ env.APP_IDENTIFIER }}
           version: ${{ env.RELEASE_VERSION }}
-          release-repository: vscodium-insiders
+          release-repository: ${{ env.ASSETS_REPOSITORY }}
           release-tag: ${{ env.RELEASE_VERSION }}-insider
           installers-regex: '\.exe$' # only .exe files
           token: ${{ secrets.STRONGER_GITHUB_TOKEN }}

.github/workflows/stable-linux.yml

@@ -17,18 +17,105 @@ on:
     paths-ignore:
     - '**/*.md'
 
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container:
-      image: ${{ matrix.image }}
 env:
   APP_NAME: VSCodium
   ASSETS_REPOSITORY: ${{ github.repository }}
-        VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
   OS_NAME: linux
-        VSCODE_ARCH: ${{ matrix.vscode_arch }}
+  VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
   VSCODE_QUALITY: stable
+
+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 }}
+      RELEASE_VERSION: ${{ env.RELEASE_VERSION }}
+      SHOULD_BUILD: ${{ env.SHOULD_BUILD }}
+      SHOULD_DEPLOY: ${{ env.SHOULD_DEPLOY }}
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ env.GITHUB_BRANCH }}
+
+      - name: Clone VSCode repo
+        run: ./get_repo.sh
+
+      - name: Check PR or cron
+        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:bionic-x64
+    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'
+
+      - name: Setup Node.js environment
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16
+
+      - name: Install Yarn
+        run: npm install -g yarn
+
+      - name: Install remote dependencies (x64)
+        env:
+          npm_config_arch: x64
+        run: ./install_remote_dependencies.sh
+        if: matrix.vscode_arch == 'x64'
+
+      # - name: Install remote dependencies (arm64)
+      #   run: |
+      #     set -e
+      #     docker run -e VSCODE_QUALITY -e GITHUB_TOKEN -v $(pwd):/root/vscodium vscodium/vscodium-linux-build-agent:centos7-devtoolset8-arm64 /root/vscodium/install_remote_dependencies.sh
+      #   if: matrix.vscode_arch == 'arm64'
+
+      - 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:
+      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:
@@ -42,13 +129,22 @@ jobs:
         - vscode_arch: armhf
           npm_arch: armv7l
           image: vscodium/vscodium-linux-build-agent:stretch-armhf
+    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
 
@@ -60,12 +156,6 @@ jobs:
       - name: Install Yarn
         run: npm install -g yarn
 
-      - name: Clone VSCode repo
-        run: ./get_repo.sh
-
-      - name: Check PR or cron
-        run: ./check_cron_or_pr.sh
-
       - name: Check existing VSCodium tags/releases
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -73,23 +163,11 @@ jobs:
         run: ./check_tags.sh
         if: env.SHOULD_DEPLOY == 'yes'
 
-      - name: Compute cache key
+      - name: Restore remote dependencies
-        id: yarnCacheKey
+        uses: actions/download-artifact@v3
-        run: echo "::set-output name=value::$(node build/azure-pipelines/computeYarnCacheKey.js)"
-        if: env.SHOULD_BUILD == 'yes'
-
-      - name: Get yarn cache directory path
-        id: yarnCacheDirPath
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-        if: env.SHOULD_BUILD == 'yes'
-
-      - name: Cache yarn directory
-        uses: actions/cache@v3
         with:
-          path: ${{ steps.yarnCacheDirPath.outputs.dir }}
+          name: remote-dependencies-${{ matrix.vscode_arch }}
-          key: linux-${{ matrix.npm_arch }}-yarnCacheDir-${{ steps.yarnCacheKey.outputs.value }}
+        if: env.SHOULD_BUILD == 'yes' && matrix.vscode_arch == 'x64'
-          restore-keys: linux-${{ matrix.npm_arch }}-yarnCacheDir-
-        if: env.SHOULD_BUILD == 'yes'
 
       - name: Build
         env:
@@ -116,34 +194,35 @@ jobs:
         if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
 
   aur:
-    needs: build
+    needs:
+      - build
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - package_name: vscodium
+          package_type: stable
+        - package_name: vscodium-git
+          package_type: rolling
     if: needs.build.outputs.SHOULD_DEPLOY == 'yes'
 
     steps:
-      - name: Publish vscodium
+      - name: Publish ${{ matrix.package_name }}
         uses: zokugun/github-actions-aur-releaser@v1
         with:
-          package_name: vscodium
+          package_name: ${{ matrix.package_name }}
-          aur_private_key: ${{ secrets.AUR_PRIVATE_KEY }}
+          package_type: ${{ matrix.package_type }}
-          aur_username: ${{ secrets.AUR_USERNAME }}
-          aur_email: ${{ secrets.AUR_EMAIL }}
-
-      - name: Publish vscodium-git
-        uses: zokugun/github-actions-aur-releaser@v1
-        with:
-          package_name: vscodium-git
-          package_type: rolling
           aur_private_key: ${{ secrets.AUR_PRIVATE_KEY }}
           aur_username: ${{ secrets.AUR_USERNAME }}
           aur_email: ${{ secrets.AUR_EMAIL }}
 
   snap:
-    needs: build
+    needs:
+      - build
     runs-on: ubuntu-latest
     env:
       APP_NAME: codium
-      ASSETS_REPOSITORY: ${{ github.repository }}
     strategy:
       fail-fast: false
       matrix:
@@ -186,7 +265,8 @@ jobs:
         if: env.SHOULD_DEPLOY == 'yes'
 
   deb-rpm-repo-hook:
-    needs: build
+    needs:
+      - build
     runs-on: ubuntu-latest
     if: needs.build.outputs.SHOULD_DEPLOY == 'yes'
 

.github/workflows/stable-macos.yml

@@ -17,16 +17,18 @@ on:
     paths-ignore:
     - '**/*.md'
 
+env:
+  APP_NAME: VSCodium
+  ASSETS_REPOSITORY: ${{ github.repository }}
+  OS_NAME: osx
+  VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
+  VSCODE_QUALITY: stable
+
 jobs:
   build:
     runs-on: ${{ matrix.runner }}
     env:
-      APP_NAME: VSCodium
-      ASSETS_REPOSITORY: ${{ github.repository }}
-      VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
-      OS_NAME: osx
       VSCODE_ARCH: ${{ matrix.vscode_arch }}
-      VSCODE_QUALITY: stable
     strategy:
       fail-fast: false
       matrix:
@@ -57,24 +59,6 @@ jobs:
         run: . check_tags.sh
         if: env.SHOULD_DEPLOY == 'yes'
 
-      - name: Compute cache key
-        id: yarnCacheKey
-        run: echo "::set-output name=value::$(node build/azure-pipelines/computeYarnCacheKey.js)"
-        if: env.SHOULD_BUILD == 'yes'
-
-      - name: Get yarn cache directory path
-        id: yarnCacheDirPath
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-        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 }}

.github/workflows/stable-windows.yml

@@ -17,6 +17,14 @@ on:
     paths-ignore:
     - '**/*.md'
 
+env:
+  APP_NAME: VSCodium
+  ASSETS_REPOSITORY: ${{ github.repository }}
+  OS_NAME: windows
+  VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
+  VSCODE_QUALITY: stable
+
+
 jobs:
   build:
     runs-on: windows-2019
@@ -24,12 +32,7 @@ jobs:
       run:
         shell: bash
     env:
-      APP_NAME: VSCodium
-      ASSETS_REPOSITORY: ${{ github.repository }}
-      VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
-      OS_NAME: windows
       VSCODE_ARCH: ${{ matrix.vscode_arch }}
-      VSCODE_QUALITY: stable
     strategy:
       fail-fast: false
       matrix:
@@ -70,24 +73,6 @@ jobs:
         run: ./check_tags.sh
         if: env.SHOULD_DEPLOY == 'yes'
 
-      - name: Compute cache key
-        id: yarnCacheKey
-        run: echo "::set-output name=value::$(node build/azure-pipelines/computeYarnCacheKey.js)"
-        if: env.SHOULD_BUILD == 'yes'
-
-      - name: Get yarn cache directory path
-        id: yarnCacheDirPath
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-        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 }}

.gitignore

@@ -13,3 +13,4 @@ build/linux/appimage/VSCodium
 build/windows/msi/releasedir
 build/windows/msi/Files*.wxs
 build/windows/msi/Files*.wixobj
+remote-dependencies.tar

DOCS.md

@@ -5,7 +5,9 @@
 - [Getting all the Telemetry Out](#disable-telemetry)
   - [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 self host your own VS Code Marketplace](#howto-selfhost-marketplace)
   - [Proprietary Debugging Tools](#proprietary-debugging-tools)
   - [Proprietary Extensions](#proprietary-extensions)
 - [Migrating from Visual Studio Code to VSCodium](#migrating)
@@ -43,7 +45,9 @@ Likewise, while the descriptions for "Extensions: Auto Check Updates" and "Exten
 
 ## <a id="extensions-marketplace"></a>Extensions + Marketplace
 
-The `product.json` file is set up to use [open-vsx.org](https://open-vsx.org/) as extension gallery, which has an [adapter](https://github.com/eclipse/openvsx/wiki/Using-Open-VSX-in-VS-Code) to the Marketplace API used by VS Code. Since that is a rather new project, you will likely miss some extensions you know from the VS Code Marketplace. You have the following options to obtain such missing extensions:
+### <a id="howto-openvsx-marketplace"></a>How to use the OpenVSX Marketplace
+
+By default the `product.json` file is set up to use [open-vsx.org](https://open-vsx.org/) as extension gallery, which has an [adapter](https://github.com/eclipse/openvsx/wiki/Using-Open-VSX-in-VS-Code) to the Marketplace API used by VS Code. Since that is a rather new project, you will likely miss some extensions you know from the VS Code Marketplace. You have the following options to obtain such missing extensions:
 
 * Ask the extension maintainers to publish to [open-vsx.org](https://open-vsx.org/) in addition to the VS Code Marketplace. The publishing process is documented in the [Open VSX Wiki](https://github.com/eclipse/openvsx/wiki/Publishing-Extensions).
 * Create a pull request to [this repository](https://github.com/open-vsx/publish-extensions) to have the [@open-vsx](https://github.com/open-vsx) service account publish the extensions for you.
@@ -81,6 +85,13 @@ with the content:
 }
 ```
 
+### <a id="howto-selfhost-marketplace"></a>How to self-host your own VS Code Marketplace
+
+Individual developers and enterprise companies in regulated or security-conscious industries can self-host their own VS Code Marketplace using the [code-marketplace](https://coder.com/blog/running-a-private-vs-code-extension-marketplace) open-source project.
+
+> `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="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).

README.md

@@ -117,13 +117,12 @@ This repo exists so that you don't have to download+build from source. The build
 
 If you want to build from source yourself, head over to [Microsoft's vscode repo](https://github.com/Microsoft/vscode) and follow their [instructions](https://github.com/Microsoft/vscode/wiki/How-to-Contribute#build-and-run). This repo exists to make it easier to get the latest version of MIT-licensed VS Code.
 
-Microsoft's build process (which we are running to build the binaries) does download additional files. This was brought up in [Microsoft/vscode#141340](https://github.com/Microsoft/vscode/issues/141340) and [Microsoft/vscode#45978](https://github.com/Microsoft/vscode/issues/45978). These are the packages downloaded during build:
+Microsoft's build process (which we are running to build the binaries) does download additional files. Those packages downloaded during build are:
 
-- Extensions from the Microsoft Marketplace:
+- Pre-built extensions from the GitHub:
-  - [ms-vscode.references-view](https://marketplace.visualstudio.com/items?itemName=ms-vscode.references-view)
+  - [ms-vscode.js-debug-companion](https://github.com/microsoft/vscode-js-debug-companion)
-  - [ms-vscode.js-debug-companion](https://marketplace.visualstudio.com/items?itemName=ms-vscode.js-debug-companion)
+  - [ms-vscode.js-debug](https://github.com/microsoft/vscode-js-debug)
-  - [ms-vscode.js-debug](https://marketplace.visualstudio.com/items?itemName=ms-vscode.js-debug)
+  - [ms-vscode.vscode-js-profile-table](https://github.com/microsoft/vscode-js-profile-visualizer)
-  - [ms-vscode.vscode-js-profile-table](https://marketplace.visualstudio.com/items?itemName=ms-vscode.vscode-js-profile-table)
 - From [Electron releases](https://github.com/electron/electron/releases) (using [gulp-atom-electron](https://github.com/joaomoreno/gulp-atom-electron))
   - electron
   - ffmpeg

build.sh

@@ -2,6 +2,12 @@
 
 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
   npm config set scripts-prepend-node-path true
   npm config set node_gyp

check_cron_or_pr.sh

@@ -23,6 +23,8 @@ else
 fi
 
 if [[ "${GITHUB_ENV}" ]]; then
+  echo "GITHUB_BRANCH=${GITHUB_BRANCH}" >> "${GITHUB_ENV}"
 	echo "SHOULD_BUILD=${SHOULD_BUILD}" >> "${GITHUB_ENV}"
 	echo "SHOULD_DEPLOY=${SHOULD_DEPLOY}" >> "${GITHUB_ENV}"
+  echo "VSCODE_QUALITY=${VSCODE_QUALITY}" >> "${GITHUB_ENV}"
 fi

check_tags.sh

@@ -330,7 +330,7 @@ else
       export SHOULD_BUILD_APPIMAGE="no"
     fi
   elif [[ "${OS_NAME}" == "osx" ]]; then
-    if [[ "${VSCODE_QUALITY}" == "insider" && "${VSCODE_ARCH}" == "arm64" ]]; then
+    if [[ "${VSCODE_ARCH}" == "arm64" ]]; then
       export SHOULD_BUILD_SRC="yes"
     fi
   elif [[ "${OS_NAME}" == "windows" ]]; then

get_repo.sh

@@ -103,10 +103,8 @@ git checkout FETCH_HEAD
 cd ..
 
 # for GH actions
-if [[ ${GITHUB_ENV} ]]; then
+if [[ "${GITHUB_ENV}" ]]; then
   echo "MS_TAG=${MS_TAG}" >> "${GITHUB_ENV}"
   echo "MS_COMMIT=${MS_COMMIT}" >> "${GITHUB_ENV}"
   echo "RELEASE_VERSION=${RELEASE_VERSION}" >> "${GITHUB_ENV}"
 fi
-
-. version.sh

insider.json

@@ -1,4 +1,4 @@
 {
-  "tag": "1.72.0",
+  "tag": "1.73.0",
-  "commit": "64bbfbf67ada9953918d72e1df2f4d8e537d340e"
+  "commit": "8fa188b2b301d36553cbc9ce1b0a146ccb93351f"
 }

install_remote_dependencies.sh

@@ -0,0 +1,11 @@
+#!/bin/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

patch.sh

@@ -13,7 +13,8 @@ fi
 
 read -p "Press any key when the conflict have been resolved..." -n1 -s
 
-git diff -U1 > "${FILE}"
+git add .
+git diff --staged -U1 > "${FILE}"
 
 cd ..
 

patches/build-version.patch

@@ -1,8 +1,8 @@
 diff --git a/.vscode/settings.json b/.vscode/settings.json
-index 184042b..a067194 100644
+index 3907bc7..1772769 100644
 --- a/.vscode/settings.json
 +++ b/.vscode/settings.json
-@@ -87,3 +87,3 @@
+@@ -88,3 +88,3 @@
  		"editor.defaultFormatter": "vscode.typescript-language-features",
 -		"editor.formatOnSave": true
 +		// "editor.formatOnSave": true
@@ -120,16 +120,43 @@ index bceda01..4fe44e2 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 ec4ff95..36e882f 100644
+index ec4ff95..2ed2c03 100644
 --- a/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
 +++ b/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
-@@ -146,4 +146,5 @@ export class BrowserDialogHandler implements IDialogHandler {
+@@ -22,2 +22,3 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
+ import { MarkdownRenderer } from 'vs/editor/contrib/markdownRenderer/browser/markdownRenderer';
++import { getReleaseString } from 'vs/workbench/common/release';
+ 
+@@ -145,2 +146,4 @@ export class BrowserDialogHandler implements IDialogHandler {
+ 		const detailString = (useAgo: boolean): string => {
++			const releaseString = getReleaseString();
++
  			return localize('aboutDetail',
--				"Version: {0}\nCommit: {1}\nDate: {2}\nBrowser: {3}",
+@@ -151,3 +154,3 @@ export class BrowserDialogHandler implements IDialogHandler {
-+				"Version: {0}\nRelease: {1}\nCommit: {2}\nDate: {3}\nBrowser: {4}",
+ 				navigator.userAgent
- 				this.productService.version || 'Unknown',
+-			);
-+				this.productService.release || 'Unknown',
++			).replace('\n', `\n${releaseString} ${this.productService.release || 'Unknown'}\n`);
- 				this.productService.commit || 'Unknown',
+ 		};
+diff --git a/src/vs/workbench/common/release.ts b/src/vs/workbench/common/release.ts
+new file mode 100644
+index 0000000..2a8ea57
+--- /dev/null
++++ b/src/vs/workbench/common/release.ts
+@@ -0,0 +1,14 @@
++import { language } from 'vs/base/common/platform';
++
++const DEFAULT_LABEL = 'Release:';
++const LABELS: { [key: string]: string } = {
++	'en': DEFAULT_LABEL,
++	'fr': 'Révision :',
++	'ru': 'Релиз:',
++	'zh-hans': '发布版本:',
++	'zh-hant': '發布版本:',
++};
++
++export function getReleaseString(): string {
++	return LABELS[language] ?? DEFAULT_LABEL;
++}
 diff --git a/src/vs/workbench/contrib/issue/browser/issueService.ts b/src/vs/workbench/contrib/issue/browser/issueService.ts
 index dc7430b..23def01 100644
 --- a/src/vs/workbench/contrib/issue/browser/issueService.ts
@@ -139,13 +166,19 @@ index dc7430b..23def01 100644
 +Release: ${this.productService.release ?? 'unknown'}
  Commit: ${this.productService.commit ?? 'unknown'}
 diff --git a/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts b/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts
-index f63b75f..8e24c02 100644
+index f63b75f..2b77c1b 100644
 --- a/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts
 +++ b/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts
-@@ -169,4 +169,5 @@ export class NativeDialogHandler implements IDialogHandler {
+@@ -17,2 +17,3 @@ import { IProductService } from 'vs/platform/product/common/productService';
- 			return localize({ key: 'aboutDetail', comment: ['Electron, Chromium, Node.js and V8 are product names that need no translation'] },
+ import { process } from 'vs/base/parts/sandbox/electron-sandbox/globals';
--				"Version: {0}\nCommit: {1}\nDate: {2}\nElectron: {3}\nChromium: {4}\nNode.js: {5}\nV8: {6}\nOS: {7}\nSandboxed: {8}",
++import { getReleaseString } from 'vs/workbench/common/release';
-+				"Version: {0}\nRelease: {1}\nCommit: {2}\nDate: {3}\nElectron: {4}\nChromium: {5}\nNode.js: {6}\nV8: {7}\nOS: {8}\nSandboxed: {9}",
+ 
- 				version,
+@@ -166,2 +167,3 @@ export class NativeDialogHandler implements IDialogHandler {
-+				this.productService.release || 'Unknown',
+ 		const osProps = await this.nativeHostService.getOSProperties();
- 				this.productService.commit || 'Unknown',
++		const releaseString = getReleaseString();
+ 
+@@ -179,3 +181,3 @@ export class NativeDialogHandler implements IDialogHandler {
+ 				process.sandboxed ? 'Yes' : 'No' // TODO@bpasero remove me once sandbox is final
+-			);
++			).replace('\n', `\n${releaseString} ${this.productService.release || 'Unknown'}\n`);
+ 		};

patches/use-github-pat.patch

@@ -1,22 +1,18 @@
 diff --git a/extensions/github-authentication/src/githubServer.ts b/extensions/github-authentication/src/githubServer.ts
-index 94ce542..d83e3c3 100644
+index 830e698..cd6f27e 100644
 --- a/extensions/github-authentication/src/githubServer.ts
 +++ b/extensions/github-authentication/src/githubServer.ts
-@@ -5,7 +5,4 @@
+@@ -7,4 +7,2 @@ import * as vscode from 'vscode';
- 
--import * as nls from 'vscode-nls';
- import * as vscode from 'vscode';
  import fetch, { Response } from 'node-fetch';
 -import { v4 as uuid } from 'uuid';
 -import { PromiseAdapter, promiseFromEvent } from './common/utils';
  import { ExperimentationTelemetry } from './experimentationService';
-@@ -13,14 +10,5 @@ import { AuthProviderType } from './github';
+@@ -12,13 +10,4 @@ import { AuthProviderType } from './github';
  import { Log } from './common/logger';
 -import { isSupportedEnvironment } from './common/env';
 -import { LoopbackAuthServer } from './authServer';
 -import path = require('path');
- 
+-
--const localize = nls.loadMessageBundle();
 -const CLIENT_ID = '01ab8ac9400c4e429b23';
 -const GITHUB_TOKEN_URL = 'https://vscode.dev/codeExchangeProxyEndpoints/github/login/oauth/access_token';
  const NETWORK_ERROR = 'network error';
@@ -25,7 +21,7 @@ index 94ce542..d83e3c3 100644
 -const REDIRECT_URL_INSIDERS = 'https://insiders.vscode.dev/redirect';
 -
  class UriEventHandler extends vscode.EventEmitter<vscode.Uri> implements vscode.UriHandler {
-@@ -44,9 +32,2 @@ export interface IGitHubServer extends vscode.Disposable {
+@@ -42,9 +31,2 @@ export interface IGitHubServer extends vscode.Disposable {
  
 -interface IGitHubDeviceCodeResponse {
 -	device_code: string;
@@ -35,12 +31,12 @@ index 94ce542..d83e3c3 100644
 -}
 -
  async function getScopes(token: string, serverUri: vscode.Uri, logger: Log): Promise<string[]> {
-@@ -57,3 +38,3 @@ async function getScopes(token: string, serverUri: vscode.Uri, logger: Log): Pro
+@@ -55,3 +37,3 @@ async function getScopes(token: string, serverUri: vscode.Uri, logger: Log): Pro
  				Authorization: `token ${token}`,
 -				'User-Agent': 'Visual-Studio-Code'
 +				'User-Agent': 'VSCodium'
  			}
-@@ -77,7 +58,4 @@ export class GitHubServer implements IGitHubServer {
+@@ -75,7 +57,4 @@ export class GitHubServer implements IGitHubServer {
  
 -	private _pendingNonces = new Map<string, string[]>();
 -	private _codeExchangePromises = new Map<string, { promise: Promise<string>; cancel: vscode.EventEmitter<void> }>();
@@ -48,11 +44,11 @@ index 94ce542..d83e3c3 100644
  	private static _uriHandler: UriEventHandler | undefined;
 -	private _redirectEndpoint: string | undefined;
  
-@@ -85,2 +63,3 @@ export class GitHubServer implements IGitHubServer {
+@@ -83,2 +62,3 @@ export class GitHubServer implements IGitHubServer {
  		public readonly type: AuthProviderType,
 +		// @ts-ignore
  		private readonly _supportDeviceCodeFlow: boolean,
-@@ -104,41 +83,2 @@ export class GitHubServer implements IGitHubServer {
+@@ -102,41 +82,2 @@ export class GitHubServer implements IGitHubServer {
  
 -	private async getRedirectEndpoint(): Promise<string> {
 -		if (this._redirectEndpoint) {
@@ -94,27 +90,27 @@ index 94ce542..d83e3c3 100644
 -	}
 -
  	dispose() {
-@@ -158,58 +98,8 @@ export class GitHubServer implements IGitHubServer {
+@@ -156,58 +97,8 @@ export class GitHubServer implements IGitHubServer {
  		let userCancelled: boolean | undefined;
--		const yes = localize('yes', "Yes");
+-		const yes = vscode.l10n.t('Yes');
--		const no = localize('no', "No");
+-		const no = vscode.l10n.t('No');
 -		const promptToContinue = async () => {
 -			if (userCancelled === undefined) {
 -				// We haven't had a failure yet so wait to prompt
 -				return;
 -			}
 -			const message = userCancelled
--				? localize('userCancelledMessage', "Having trouble logging in? Would you like to try a different way?")
+-				? vscode.l10n.t('Having trouble logging in? Would you like to try a different way?')
--				: localize('otherReasonMessage', "You have not yet finished authorizing this extension to use GitHub. Would you like to keep trying?");
+-				: vscode.l10n.t('You have not yet finished authorizing this extension to use GitHub. Would you like to keep trying?');
 -			const result = await vscode.window.showWarningMessage(message, yes, no);
 -			if (result !== yes) {
 -				throw new Error('Cancelled');
 -			}
 -		};
- 
+-
 -		const nonce = uuid();
 -		const callbackUri = await vscode.env.asExternalUri(vscode.Uri.parse(`${vscode.env.uriScheme}://vscode.github-authentication/did-authenticate?nonce=${encodeURIComponent(nonce)}`));
--
+ 
 -		const supported = isSupportedEnvironment(callbackUri);
 -		if (supported) {
 -			try {
@@ -158,13 +154,17 @@ index 94ce542..d83e3c3 100644
 +			this._logger.error(e);
 +			userCancelled = e.message ?? e === 'User Cancelled';
  		}
-@@ -219,131 +109,5 @@ export class GitHubServer implements IGitHubServer {
+@@ -217,136 +108,2 @@ export class GitHubServer implements IGitHubServer {
  
 -	private async doLoginWithoutLocalServer(scopes: string, nonce: string, callbackUri: vscode.Uri): Promise<string> {
 -		this._logger.info(`Trying without local server... (${scopes})`);
 -		return await vscode.window.withProgress<string>({
 -			location: vscode.ProgressLocation.Notification,
--			title: localize('signingIn', 'Signing in to {0}...', this.baseUri.authority),
+-			title: vscode.l10n.t({
+-				message: 'Signing in to {0}...',
+-				args: [this.baseUri.authority],
+-				comment: ['The {0} will be a url, e.g. github.com']
+-			}),
 -			cancellable: true
 -		}, async (_, token) => {
 -			const existingNonces = this._pendingNonces.get(scopes) || [];
@@ -209,7 +209,11 @@ index 94ce542..d83e3c3 100644
 -		this._logger.info(`Trying with local server... (${scopes})`);
 -		return await vscode.window.withProgress<string>({
 -			location: vscode.ProgressLocation.Notification,
--			title: localize('signingInAnotherWay', "Signing in to {0}...", this.baseUri.authority),
+-			title: vscode.l10n.t({
+-				message: 'Signing in to {0}...',
+-				args: [this.baseUri.authority],
+-				comment: ['The {0} will be a url, e.g. github.com']
+-			}),
 -			cancellable: true
 -		}, async (_, token) => {
 -			const redirectUri = await this.getRedirectEndpoint();
@@ -266,15 +270,15 @@ index 94ce542..d83e3c3 100644
 -
 -		const json = await result.json() as IGitHubDeviceCodeResponse;
 -
--
+-		const button = vscode.l10n.t('Copy & Continue to GitHub');
 -		const modalResult = await vscode.window.showInformationMessage(
--			localize('code.title', "Your Code: {0}", json.user_code),
+-			vscode.l10n.t({ message: 'Your Code: {0}', args: [json.user_code], comment: ['The {0} will be a code, e.g. 123-456'] }),
 -			{
 -				modal: true,
--				detail: localize('code.detail', "To finish authenticating, navigate to GitHub and paste in the above one-time code.")
+-				detail: vscode.l10n.t('To finish authenticating, navigate to GitHub and paste in the above one-time code.')
--			}, 'Copy & Continue to GitHub');
+-			}, button);
 -
--		if (modalResult !== 'Copy & Continue to GitHub') {
+-		if (modalResult !== button) {
 -			throw new Error('User Cancelled');
 -		}
 -
@@ -287,11 +291,7 @@ index 94ce542..d83e3c3 100644
 -	}
 -
  	private async doLoginWithPat(scopes: string): Promise<string> {
- 		this._logger.info(`Trying to retrieve PAT... (${scopes})`);
+@@ -374,124 +131,2 @@ export class GitHubServer implements IGitHubServer {
--		const token = await vscode.window.showInputBox({ prompt: 'GitHub Personal Access Token', ignoreFocusOut: true });
-+		const token = await vscode.window.showInputBox({ prompt: `GitHub Personal Access Token (${scopes})`, ignoreFocusOut: true });
- 		if (!token) { throw new Error('User Cancelled'); }
-@@ -368,121 +132,2 @@ export class GitHubServer implements IGitHubServer {
  
 -	private async waitForDeviceCodeAccessToken(
 -		json: IGitHubDeviceCodeResponse,
@@ -299,11 +299,14 @@ index 94ce542..d83e3c3 100644
 -		return await vscode.window.withProgress<string>({
 -			location: vscode.ProgressLocation.Notification,
 -			cancellable: true,
--			title: localize(
+-			title: vscode.l10n.t({
--				'progress',
+-				message: 'Open [{0}]({0}) in a new tab and paste your one-time code: {1}',
--				"Open [{0}]({0}) in a new tab and paste your one-time code: {1}",
+-				args: [json.verification_uri, json.user_code],
--				json.verification_uri,
+-				comment: [
--				json.user_code)
+-					'The [{0}]({0}) will be a url and the {1} will be a code, e.g. 123-456',
+-					'{Locked="[{0}]({0})"}'
+-				]
+-			})
 -		}, async (_, token) => {
 -			const refreshTokenUri = this.baseUri.with({
 -				path: '/login/oauth/access_token',
@@ -414,7 +417,7 @@ index 94ce542..d83e3c3 100644
 -
  	private getServerUri(path: string = '') {
 diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts b/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
-index bee1974..0f57882 100644
+index ce2a3e8..2a5cf60 100644
 --- a/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
 +++ b/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
 @@ -306,3 +306,3 @@ export class AccountsActivityActionViewItem extends MenuActivityActionViewItem {
@@ -423,10 +426,10 @@ index bee1974..0f57882 100644
 +		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 69cb0d2..920d6c6 100644
+index d5e2b75..a996eb7 100644
 --- a/src/vs/workbench/services/authentication/browser/authenticationService.ts
 +++ b/src/vs/workbench/services/authentication/browser/authenticationService.ts
-@@ -275,12 +275,2 @@ export class AuthenticationService extends Disposable implements IAuthentication
+@@ -279,12 +279,2 @@ export class AuthenticationService extends Disposable implements IAuthentication
  		}
 -
 -		if (!this._authenticationProviders.size) {

prepare_assets.sh

@@ -8,7 +8,7 @@ npm install -g checksum
 
 sum_file() {
   if [[ -f "${1}" ]]; then
-    echo "Calcuating checksum for ${1}"
+    echo "Calculating checksum for ${1}"
     checksum -a sha256 "${1}" > "${1}".sha256
     checksum "${1}" > "${1}".sha1
   fi

prepare_vscode.sh

@@ -59,7 +59,7 @@ if [[ "${OS_NAME}" == "osx" ]]; then
   yarn postinstall
 elif [[ "${npm_config_arch}" == "armv7l" || "${npm_config_arch}" == "ia32" ]]; then
   # node-gyp@9.0.0 shipped with node@16.15.0 starts using config.gypi
-  # from the custom headers path if dist-url option was set instead of
+  # from the custom headers path if dist-url option was set, instead of
   # using the config value from the process. Electron builds with pointer compression
   # enabled for x64 and arm64, but incorrectly ships a single copy of config.gypi
   # with v8_enable_pointer_compression option always set for all target architectures.
@@ -94,7 +94,7 @@ setpath "product" "keyboardShortcutsUrlLinux" "https://go.microsoft.com/fwlink/?
 setpath "product" "keyboardShortcutsUrlMac" "https://go.microsoft.com/fwlink/?linkid=832143"
 setpath "product" "keyboardShortcutsUrlWin" "https://go.microsoft.com/fwlink/?linkid=832145"
 setpath "product" "licenseUrl" "https://github.com/VSCodium/vscodium/blob/master/LICENSE"
-setpath "product" "linkProtectionTrustedDomains" '["https://open-vsx.org"]'
+setpath_json "product" "linkProtectionTrustedDomains" '["https://open-vsx.org"]'
 setpath "product" "releaseNotesUrl" "https://go.microsoft.com/fwlink/?LinkID=533483#vscode"
 setpath "product" "reportIssueUrl" "https://github.com/VSCodium/vscodium/issues/new"
 setpath "product" "requestFeatureUrl" "https://go.microsoft.com/fwlink/?LinkID=533482"

product.json

@@ -61,8 +61,6 @@
       "fileSearchProvider",
       "findTextInFiles",
       "notebookCellExecutionState",
-      "notebookContentProvider",
-      "notebookEditor",
       "notebookLiveShare",
       "terminalDimensions",
       "terminalDataWriteEvent",
@@ -76,13 +74,11 @@
       "tunnels"
     ],
     "ms-toolsai.vscode-ai-remote": [
-      "resolvers",
+      "resolvers"
-      "notebookEditor"
     ],
     "ms-python.python": [
       "quickPickSortByLabel",
-      "testObserver",
+      "testObserver"
-      "localization"
     ],
     "ms-dotnettools.dotnet-interactive-vscode": [
       "notebookMessaging"
@@ -101,8 +97,7 @@
     "ms-vscode.azure-repos": [
       "extensionRuntime",
       "fileSearchProvider",
-      "textSearchProvider",
+      "textSearchProvider"
-      "localization"
     ],
     "ms-vscode.remote-repositories": [
       "contribEditSessions",
@@ -120,8 +115,7 @@
       "scmSelectedProvider",
       "scmValidation",
       "textSearchProvider",
-      "timeline",
+      "timeline"
-      "localization"
     ],
     "ms-vscode-remote.remote-wsl": [
       "resolvers",
@@ -136,7 +130,8 @@
       "telemetry"
     ],
     "ms-vscode.remote-server": [
-      "resolvers"
+      "resolvers",
+      "tunnels"
     ],
     "ms-vscode.remote-explorer": [
       "contribViewsRemote",
@@ -165,8 +160,7 @@
       "commentsResolvedState",
       "contribShareMenu",
       "contribCommentPeekContext",
-      "treeItemCheckbox",
+      "treeItemCheckbox"
-      "localization"
     ],
     "GitHub.copilot": [
       "inlineCompletionsNew",
@@ -189,8 +183,7 @@
       "scmSelectedProvider",
       "scmValidation",
       "textSearchProvider",
-      "timeline",
+      "timeline"
-      "localization"
     ],
     "ms-python.gather": [
       "notebookCellExecutionState"
@@ -198,9 +191,11 @@
     "ms-python.vscode-pylance": [
       "notebookCellExecutionState"
     ],
+    "ms-toolsai.jupyter-renderers": [
+      "contribNotebookStaticPreloads"
+    ],
     "ms-toolsai.jupyter": [
       "notebookControllerKind",
-      "notebookDebugOptions",
       "notebookDeprecated",
       "notebookMessaging",
       "notebookMime",
@@ -208,11 +203,12 @@
       "portsAttributes",
       "quickPickSortByLabel",
       "notebookKernelSource",
-      "interactiveWindow"
+      "interactiveWindow",
+      "notebookControllerAffinityHidden",
+      "contribNotebookStaticPreloads"
     ],
     "dbaeumer.vscode-eslint": [
-      "notebookCellExecutionState",
+      "notebookCellExecutionState"
-      "localization"
     ],
     "ms-vscode.azure-sphere-tools-ui": [
       "resolvers",
@@ -226,9 +222,6 @@
     ],
     "ms-vscode.cpptools": [
       "terminalDataWriteEvent"
-    ],
-    "ms-vscode.vscode-github-issue-notebooks": [
-      "localization"
     ]
   },
   "extensionKind": {

update_version.sh

@@ -75,15 +75,20 @@ generateJson() {
 updateLatestVersion() {
   echo "Generating ${VERSION_PATH}/latest.json"
 
+  # do not update the same version since BUILD_SOURCEVERSION might be different
+  if [[ -f "versions/${VERSION_PATH}/latest.json" ]]; then
+    CURRENT_VERSION=$( jq -r '.name' "versions/${VERSION_PATH}/latest.json" )
+
+    if [[ "${CURRENT_VERSION}" == "${RELEASE_VERSION}" ]]; then
+      return
+    fi
+  fi
+
+  mkdir -p "versions/${VERSION_PATH}"
+
   generateJson
 
-  cd versions
+  echo "${JSON_DATA}" > "versions/${VERSION_PATH}/latest.json"
-
-  # create/update the latest.json file in the correct location
-  mkdir -p "${VERSION_PATH}"
-  echo "${JSON_DATA}" > "${VERSION_PATH}/latest.json"
-
-  cd ..
 }
 
 # init versions repo for later commiting + pushing the json file to it

version.sh

@@ -2,24 +2,18 @@
 
 if [[ -z "${BUILD_SOURCEVERSION}" ]]; then
 
-    APP_HASH=$( git rev-parse HEAD )
-
-    cd vscode
-    VSCODE_HASH=$( git rev-parse HEAD )
-    cd ..
-
     if type -t "sha1sum" > /dev/null 2>&1; then
-      export BUILD_SOURCEVERSION=$( echo "${APP_HASH}:${VSCODE_HASH}" | sha1sum | cut -d' ' -f1 )
+      export BUILD_SOURCEVERSION=$( echo "${RELEASE_VERSION/-*/}" | sha1sum | cut -d' ' -f1 )
     else
       npm install -g checksum
 
-      export BUILD_SOURCEVERSION=$( echo "${APP_HASH}:${VSCODE_HASH}" | checksum )
+      export BUILD_SOURCEVERSION=$( echo "${RELEASE_VERSION/-*/}" | checksum )
     fi
 
     echo "BUILD_SOURCEVERSION=\"${BUILD_SOURCEVERSION}\""
 
     # for GH actions
-    if [[ $GITHUB_ENV ]]; then
+    if [[ "${GITHUB_ENV}" ]]; then
-        echo "BUILD_SOURCEVERSION=$BUILD_SOURCEVERSION" >> $GITHUB_ENV
+        echo "BUILD_SOURCEVERSION=${BUILD_SOURCEVERSION}" >> "${GITHUB_ENV}"
     fi
 fi