Merge pull request #628 from sscotth/patch-1

OS X -> macOS

.github/workflows/linux.yml

@@ -35,7 +35,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Setup Node.js environment
-        uses: actions/setup-node@v1.4.3
+        uses: actions/setup-node@v1
         with:
           node-version: 12.14.1
 

.github/workflows/macos.yml

@@ -12,26 +12,24 @@ jobs:
     runs-on: macOS-latest
     env:
       OS_NAME: "osx"
+      VSCODE_ARCH: "x64"
     steps:
       - uses: actions/checkout@v2
         
       - name: Setup Node.js environment
-        uses: actions/setup-node@v1.4.3
+        uses: actions/setup-node@v1
         with:
           node-version: 12.14.1
           
       - name: Clone VSCode repo
         run: |
           . get_repo.sh
-          echo "::set-env name=LATEST_MS_TAG::$LATEST_MS_TAG"
-          echo "::set-env name=LATEST_MS_COMMIT::$LATEST_MS_COMMIT"
 
       - name: Check existing VSCodium tags/releases
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           . check_tags.sh
-          echo "::set-env name=SHOULD_BUILD::$SHOULD_BUILD"
           
       - name: Build
         env:
@@ -46,8 +44,8 @@ jobs:
           CERTIFICATE_OSX_ID: ${{ secrets.CERTIFICATE_OSX_ID }}
         if: env.SHOULD_BUILD == 'yes'
         run: |
-          if [ -d "VSCode-darwin" ]; then # just in case the build failed
-            cd VSCode-darwin
+          if [ -d "VSCode-darwin-${VSCODE_ARCH}" ]; then # just in case the build failed
+            cd "VSCode-darwin-${VSCODE_ARCH}"
             export CERTIFICATE_P12=VSCodium.p12
             echo $CERTIFICATE_OSX_P12 | base64 --decode > $CERTIFICATE_P12
             export KEYCHAIN=build.keychain
@@ -61,15 +59,15 @@ jobs:
 
       - name: Zip release
         run: |
-          cd VSCode-darwin
-          zip -r -X -y ../VSCodium-darwin-${LATEST_MS_TAG}.zip ./*.app
+          cd "VSCode-darwin-${VSCODE_ARCH}"
+          zip -r -X -y ../VSCodium-darwin-${VSCODE_ARCH}-${LATEST_MS_TAG}.zip ./*.app
         if: env.SHOULD_BUILD == 'yes'
 
       - name: DMG the release
         run: |
-          pushd VSCode-darwin
+          pushd "VSCode-darwin-${VSCODE_ARCH}"
           npx create-dmg VSCodium.app ..
-          mv "../VSCodium ${LATEST_MS_TAG}.dmg" "../VSCodium.${LATEST_MS_TAG}.dmg"
+          mv "../VSCodium ${LATEST_MS_TAG}.dmg" "../VSCodium.${VSCODE_ARCH}.${LATEST_MS_TAG}.dmg"
           popd
         if: env.SHOULD_BUILD == 'yes'
 

.github/workflows/windows.yml

@@ -0,0 +1,89 @@
+name: windows_build
+
+on:
+  schedule:
+    - cron: '0 0 * * *'
+  push:
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  windows:
+    runs-on: windows-2016
+    env:
+      VSCODE_ARCH: ${{ matrix.vscode_arch }}
+      OS_NAME: 'windows'
+    strategy:
+      fail-fast: false
+      matrix:
+        vscode_arch: [x64, ia32, arm64]
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Setup Node.js environment
+        uses: actions/setup-node@v1
+        with:
+          node-version: 12.18.3
+
+      - name: Install Yarn
+        run: npm install -g yarn
+
+      - name: Setup Python 2
+        uses: actions/setup-python@v2
+        with:
+          python-version: '2.x'
+
+      - name: Clone VSCode repo
+        run: ./get_repo.sh
+        shell: bash
+
+      - name: Check existing VSCodium tags/releases
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: ./check_tags.sh
+        shell: bash
+
+      - name: Build
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          npm_config_arch: ${{ matrix.vscode_arch }}
+          npm_config_target_arch: ${{ matrix.vscode_arch }}
+        run: ./build.sh
+        shell: bash
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Move/rename build artifacts
+        run: |
+          mv vscode\\.build\\win32-${VSCODE_ARCH}\\system-setup\\VSCodeSetup.exe VSCodiumSetup-${VSCODE_ARCH}-${LATEST_MS_TAG}.exe
+          mv vscode\\.build\\win32-${VSCODE_ARCH}\\user-setup\\VSCodeSetup.exe VSCodiumUserSetup-${VSCODE_ARCH}-${LATEST_MS_TAG}.exe
+          mv vscode\\.build\\win32-${VSCODE_ARCH}\\archive\\VSCode-win32-${VSCODE_ARCH}.zip VSCodium-win32-${VSCODE_ARCH}-${LATEST_MS_TAG}.zip
+        shell: bash
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Generate shasums
+        run: ./sum.sh
+        shell: bash
+        if: env.SHOULD_BUILD == 'yes'
+      
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        if: env.SHOULD_BUILD == 'yes'
+        with:
+          tag_name: ${{ env.LATEST_MS_TAG }}
+          files: |
+            ./*.sha256
+            ./VSCodium*.zip
+            ./VSCodiumUserSetup*.exe
+            ./VSCodiumSetup*.exe
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Update versions repo
+        if: env.SHOULD_BUILD == 'yes'
+        run: ./update_version.sh
+        shell: bash
+        env:
+          GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }}
+          GITHUB_USERNAME: ${{ github.repository_owner }}
+

.gitignore

@@ -1,2 +1,3 @@
 vscode
-VS*/*
+VS*/*
+.DS_Store

DOCS.md

@@ -59,7 +59,7 @@ A workaround exists to get debugging working in C# projects, by using Samsung's
 
 ### Proprietary Extensions
 
-Like the debuggers mentioned above, some extensions you may find in the marketplace (like the [Remote Development Extensions](https://code.visualstudio.com/docs/remote/remote-overview)) only function the offical Visual Studio Code build. You can work around this by adding the extension's internal ID (found on the extension's page) to the `extensionAllowedProposedApi` property of the product.json in your VSCodium installation. For example:
+Like the debuggers mentioned above, some extensions you may find in the marketplace (like the [Remote Development Extensions](https://code.visualstudio.com/docs/remote/remote-overview)) only function with the offical Visual Studio Code build. You can work around this by adding the extension's internal ID (found on the extension's page) to the `extensionAllowedProposedApi` property of the product.json in your VSCodium installation. For example:
 
 ```json
   "extensionAllowedProposedApi": [

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 Peter Squicciarini
+Copyright (c) 2020 Peter Squicciarini
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -40,10 +40,10 @@
 #### <a id="install-with-brew"></a>Install with Brew (Mac)
 If you are on a Mac and have [Homebrew](https://brew.sh/) installed:
 ```bash
-brew cask install vscodium
+brew install --cask vscodium
 ```
 
-_Note for Mac OS X Mojave users: if you see "App can't be opened because Apple cannot check it for malicious software" when opening VSCodium the first time, you can right-click the application and choose Open. This should only be required the first time opening on Mojave._
+_Note for Mac macOS Mojave users: if you see "App can't be opened because Apple cannot check it for malicious software" when opening VSCodium the first time, you can right-click the application and choose Open. This should only be required the first time opening on Mojave._
 
 #### <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:
@@ -75,7 +75,7 @@ snap install codium
 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. 
 
 #### <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 [@CRKatri](https://github.com/CRKatri). 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) 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.
 
 #### <a id="flatpak"></a>Flatpak Option (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/):
@@ -88,7 +88,7 @@ flatpak run com.vscodium.codium
 ## <a id="why"></a>Why Does This Exist
 This repository contains build files to generate free release binaries of Microsoft's VSCode. When we speak of "free software", we're talking about freedom, not price.
 
-Microsoft's downloads of Visual Studio Code are licensed under [this not-FLOSS license](https://code.visualstudio.com/license) and contain telemetry/tracking. According to [this comment](https://github.com/Microsoft/vscode/issues/60#issuecomment-161792005) from a Visual Studio Code maintainer: 
+Microsoft's releases of Visual Studio Code are licensed under [this not-FLOSS license](https://code.visualstudio.com/license) and contain telemetry/tracking. According to [this comment](https://github.com/Microsoft/vscode/issues/60#issuecomment-161792005) from a Visual Studio Code maintainer: 
 
 > When we [Microsoft] build Visual Studio Code, we do exactly this. We clone the vscode repository, we lay down a customized product.json that has Microsoft specific functionality (telemetry, gallery, logo, etc.), and then produce a build that we release under our license.
 > 
@@ -118,12 +118,12 @@ According to the VS Code Marketplace [Terms of Use](https://aka.ms/vsmarketplace
 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.
 
 ### How are the VSCodium binaries built?
-If you would like to see the commands we run to build `vscode` into VSCodium binaries, have a look at the workflow files in `.github/workflow` (for Linux and OS X builds) and the `win32-build.yml` file (for Windows builds). These build files call all the other scripts in the repo. If you find something that doesn't make sense, feel free to ask about it [on Gitter](https://gitter.im/VSCodium/Lobby).
+If you would like to see the commands we run to build `vscode` into VSCodium binaries, have a look at the workflow files in `.github/workflow` (for Linux and macOS builds) and the `win32-build.yml` file (for Windows builds). These build files call all the other scripts in the repo. If you find something that doesn't make sense, feel free to ask about it [on Gitter](https://gitter.im/VSCodium/Lobby).
 
 The builds are run every day, but exit early if there isn't a new release from Microsoft. 
 
 ## <a id="supported-os"></a>Supported OS
-- [x] OS X (`zip`, `dmg`)
+- [x] macOS (`zip`, `dmg`)
 - [x] Linux x64 (`deb`, `rpm`, `AppImage`, `tar.gz`)
 - [x] Linux x86 (`deb`, `rpm`, `tar.gz`) ([up to v1.35.1](https://code.visualstudio.com/updates/v1_36#_linux-32bit-support-ends))
 - [x] Linux arm64 (`deb`, `tar.gz`)

azure-pipelines.yml

@@ -1,16 +0,0 @@
-jobs:
-- job: Windows
-  pool:
-    vmImage: VS2017-Win2016
-  variables:
-    BUILDARCH: x64
-  steps:
-  - template: win32-build.yml
-
-- job: Windows32
-  pool:
-    vmImage: VS2017-Win2016
-  variables:
-    BUILDARCH: ia32
-  steps:
-  - template: win32-build.yml

build.sh

@@ -5,14 +5,7 @@ set -ex
 if [[ "$SHOULD_BUILD" == "yes" ]]; then
   npm config set scripts-prepend-node-path true
 
-  export BUILD_SOURCEVERSION=$LATEST_MS_COMMIT
   echo "LATEST_MS_COMMIT: ${LATEST_MS_COMMIT}"
-  echo "BUILD_SOURCEVERSION: ${BUILD_SOURCEVERSION}"
-
-  if [[ "$CI_WINDOWS" == "True" ]]; then
-    export npm_config_arch="$BUILDARCH"
-    export npm_config_target_arch="$BUILDARCH"
-  fi
 
   . prepare_vscode.sh
 
@@ -26,15 +19,15 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
   yarn gulp minify-vscode
 
   if [[ "$OS_NAME" == "osx" ]]; then
-    yarn gulp vscode-darwin-min-ci
-  elif [[ "$CI_WINDOWS" == "True" ]]; then
+    yarn gulp "vscode-darwin-${VSCODE_ARCH}-min-ci"
+  elif [[ "$OS_NAME" == "windows" ]]; then
     cp LICENSE.txt LICENSE.rtf # windows build expects rtf license
-    yarn gulp "vscode-win32-${BUILDARCH}-min-ci"
-    yarn gulp "vscode-win32-${BUILDARCH}-code-helper"
-    yarn gulp "vscode-win32-${BUILDARCH}-inno-updater"
-    yarn gulp "vscode-win32-${BUILDARCH}-archive"
-    yarn gulp "vscode-win32-${BUILDARCH}-system-setup"
-    yarn gulp "vscode-win32-${BUILDARCH}-user-setup"
+    yarn gulp "vscode-win32-${VSCODE_ARCH}-min-ci"
+    yarn gulp "vscode-win32-${VSCODE_ARCH}-code-helper"
+    yarn gulp "vscode-win32-${VSCODE_ARCH}-inno-updater"
+    yarn gulp "vscode-win32-${VSCODE_ARCH}-archive"
+    yarn gulp "vscode-win32-${VSCODE_ARCH}-system-setup"
+    yarn gulp "vscode-win32-${VSCODE_ARCH}-user-setup"
   else # linux
     yarn gulp "vscode-linux-${VSCODE_ARCH}-min-ci"
     if [[ "$SKIP_LINUX_PACKAGES" != "True" ]]; then

check_tags.ps1

@@ -1,38 +0,0 @@
-echo "tag: $env:LATEST_MS_TAG"
-$REPO_URI = [uri]$env:BUILD_REPOSITORY_URI
-$USER_REPO = $REPO_URI."LocalPath"
-echo $USER_REPO
-$GITHUB_RESPONSE = curl.exe -s -H "Authorization: token $env:MAPPED_GITHUB_TOKEN" "https://api.github.com/repos$USER_REPO/releases/tags/$env:LATEST_MS_TAG"
-echo "Github response: ${GITHUB_RESPONSE}"
-$VSCODIUM_ASSETS = $GITHUB_RESPONSE | jq '.assets'
-echo "VSCodium assets: ${VSCODIUM_ASSETS}"
-
-# if we just don't have the github token, get out fast
-if (!$env:MAPPED_GITHUB_TOKEN -or $env:MAPPED_GITHUB_TOKEN -like "*GITHUB_TOKEN*") {
-  echo "This build does not have the GH token"
-  echo $env:MAPPED_GITHUB_TOKEN
-  return
-}
-
-if ($VSCODIUM_ASSETS -eq "null" -or !$VSCODIUM_ASSETS) {
-  echo "Release assets do not exist at all, continuing build"
-  $SHOULD_BUILD = 'yes'
-} else {
-  $WindowsAssets = ($VSCODIUM_ASSETS | ConvertFrom-Json) | Where-Object { $_.name.Contains('exe') }
-  $SYSTEM_SETUP = $WindowsAssets | Where-Object { $_.name.Contains('Setup') }
-  $USER_SETUP = $WindowsAssets | Where-Object { $_.name.Contains('User') }
-  if (!$SYSTEM_SETUP) {
-    echo "Building on Windows because we have no system-setup.exe";
-    $SHOULD_BUILD = 'yes'
-  }
-  elseif (!$USER_SETUP) {
-    echo "Building on Windows because we have no user-setup.exe";
-    $SHOULD_BUILD = 'yes'
-  }
-  else {
-    echo "Already have all the Windows builds"
-  } 
-}
-
-
-Write-Host "##vso[task.setvariable variable=SHOULD_BUILD]$SHOULD_BUILD"

check_tags.sh

@@ -10,57 +10,118 @@ VSCODIUM_ASSETS=$(echo $GITHUB_RESPONSE | jq '.assets')
 if [ "$GITHUB_TOKEN" != "" ]; then
   if [ "$VSCODIUM_ASSETS" != "null" ]; then
     if [[ "$OS_NAME" == "osx" ]]; then
-      HAVE_MAC=$(echo $VSCODIUM_ASSETS | jq --arg suffix "darwin-$LATEST_MS_TAG.zip" 'map(.name) | contains([$suffix])')
+      HAVE_MAC=$(echo $VSCODIUM_ASSETS | jq --arg suffix "darwin-$VSCODE_ARCH-$LATEST_MS_TAG.zip" 'map(.name) | contains([$suffix])')
       if [[ "$HAVE_MAC" != "true" ]]; then
         echo "Building on Mac because we have no ZIP"
         export SHOULD_BUILD="yes"
       fi
-    elif [[ $VSCODE_ARCH == "arm64" ]]; then
-      HAVE_ARM64_DEB=$(echo $VSCODIUM_ASSETS | jq 'map(.name) | contains(["arm64.deb"])')
-      HAVE_ARM64_TAR=$(echo $VSCODIUM_ASSETS | jq --arg suffix "arm64-$LATEST_MS_TAG.tar.gz" 'map(.name) | contains([$suffix])')
-      if [[ "$HAVE_ARM64_DEB" != "true" ]]; then
-        echo "Building on Linux arm64 because we have no DEB"
-        export SHOULD_BUILD="yes"
+    elif [[ "$OS_NAME" == "windows" ]]; then
+      if [[ $VSCODE_ARCH == "arm64" ]]; then
+        HAVE_ARM64_SYS=$(echo $VSCODIUM_ASSETS | jq --arg suffix "VSCodiumSetup-$VSCODE_ARCH-$LATEST_MS_TAG.exe" 'map(.name) | contains([$suffix])')
+        HAVE_ARM64_USR=$(echo $VSCODIUM_ASSETS | jq --arg suffix "UserSetup-$VSCODE_ARCH-$LATEST_MS_TAG.exe" 'map(.name) | contains([$suffix])')
+        HAVE_ARM64_ZIP=$(echo $VSCODIUM_ASSETS | jq --arg suffix "win32-$VSCODE_ARCH-$LATEST_MS_TAG.zip" 'map(.name) | contains([$suffix])')
+        if [[ "$HAVE_ARM64_SYS" != "true" ]]; then
+          echo "Building on Windows arm64 because we have no system setup"
+          export SHOULD_BUILD="yes"
+        fi
+        if [[ "$HAVE_ARM64_USR" != "true" ]]; then
+          echo "Building on Windows arm64 because we have no user setup"
+          export SHOULD_BUILD="yes"
+        fi
+        if [[ "$HAVE_ARM64_ZIP" != "true" ]]; then
+          echo "Building on Windows arm64 because we have no zip"
+          export SHOULD_BUILD="yes"
+        fi
+        if [[ "$SHOULD_BUILD" != "yes" ]]; then
+          echo "Already have all the Windows arm64 builds"
+        fi
+      elif [[ $VSCODE_ARCH == "ia32" ]]; then
+        HAVE_IA32_SYS=$(echo $VSCODIUM_ASSETS | jq --arg suffix "VSCodiumSetup-$VSCODE_ARCH-$LATEST_MS_TAG.exe" 'map(.name) | contains([$suffix])')
+        HAVE_IA32_USR=$(echo $VSCODIUM_ASSETS | jq --arg suffix "UserSetup-$VSCODE_ARCH-$LATEST_MS_TAG.exe" 'map(.name) | contains([$suffix])')
+        HAVE_IA32_ZIP=$(echo $VSCODIUM_ASSETS | jq --arg suffix "win32-$VSCODE_ARCH-$LATEST_MS_TAG.zip" 'map(.name) | contains([$suffix])')
+        if [[ "$HAVE_IA32_SYS" != "true" ]]; then
+          echo "Building on Windows ia32 because we have no system setup"
+          export SHOULD_BUILD="yes"
+        fi
+        if [[ "$HAVE_IA32_USR" != "true" ]]; then
+          echo "Building on Windows ia32 because we have no user setup"
+          export SHOULD_BUILD="yes"
+        fi
+        if [[ "$HAVE_IA32_ZIP" != "true" ]]; then
+          echo "Building on Windows ia32 because we have no zip"
+          export SHOULD_BUILD="yes"
+        fi
+        if [[ "$SHOULD_BUILD" != "yes" ]]; then
+          echo "Already have all the Windows ia32 builds"
+        fi
+      else # Windows x64
+        HAVE_X64_SYS=$(echo $VSCODIUM_ASSETS | jq --arg suffix "VSCodiumSetup-$VSCODE_ARCH-$LATEST_MS_TAG.exe" 'map(.name) | contains([$suffix])')
+        HAVE_X64_USR=$(echo $VSCODIUM_ASSETS | jq --arg suffix "UserSetup-$VSCODE_ARCH-$LATEST_MS_TAG.exe" 'map(.name) | contains([$suffix])')
+        HAVE_X64_ZIP=$(echo $VSCODIUM_ASSETS | jq --arg suffix "win32-$VSCODE_ARCH-$LATEST_MS_TAG.zip" 'map(.name) | contains([$suffix])')
+        if [[ "$HAVE_X64_SYS" != "true" ]]; then
+          echo "Building on Windows x64 because we have no system setup"
+          export SHOULD_BUILD="yes"
+        fi
+        if [[ "$HAVE_X64_USR" != "true" ]]; then
+          echo "Building on Windows x64 because we have no user setup"
+          export SHOULD_BUILD="yes"
+        fi
+        if [[ "$HAVE_X64_ZIP" != "true" ]]; then
+          echo "Building on Windows x64 because we have no zip"
+          export SHOULD_BUILD="yes"
+        fi
+        if [[ "$SHOULD_BUILD" != "yes" ]]; then
+          echo "Already have all the Windows x64 builds"
+        fi
       fi
-      if [[ "$HAVE_ARM64_TAR" != "true" ]]; then
-        echo "Building on Linux arm64 because we have no TAR"
-        export SHOULD_BUILD="yes"
-      fi
-      if [[ "$SHOULD_BUILD" != "yes" ]]; then
-        echo "Already have all the Linux arm64 builds"
-      fi
-    elif [[ $VSCODE_ARCH == "armhf" ]]; then
-      HAVE_ARM_DEB=$(echo $VSCODIUM_ASSETS | jq 'map(.name) | contains(["armhf.deb"])')
-      HAVE_ARM_TAR=$(echo $VSCODIUM_ASSETS | jq --arg suffix "armhf-$LATEST_MS_TAG.tar.gz" 'map(.name) | contains([$suffix])')
-      if [[ "$HAVE_ARM_DEB" != "true" ]]; then
-        echo "Building on Linux arm because we have no DEB"
-        export SHOULD_BUILD="yes"
-      fi
-      if [[ "$HAVE_ARM_TAR" != "true" ]]; then
-        echo "Building on Linux arm because we have no TAR"
-        export SHOULD_BUILD="yes"
-      fi
-      if [[ "$SHOULD_BUILD" != "yes" ]]; then
-        echo "Already have all the Linux arm builds"
-      fi
-    else
-      HAVE_64_RPM=$(echo $VSCODIUM_ASSETS | jq 'map(.name) | contains(["x86_64.rpm"])')
-      HAVE_64_DEB=$(echo $VSCODIUM_ASSETS | jq 'map(.name) | contains(["amd64.deb"])')
-      HAVE_64_TAR=$(echo $VSCODIUM_ASSETS | jq --arg suffix "x64-$LATEST_MS_TAG.tar.gz" 'map(.name) | contains([$suffix])')
-      if [[ "$HAVE_64_RPM" != "true" ]]; then
-        echo "Building on Linux x64 because we have no RPM"
-        export SHOULD_BUILD="yes"
-      fi
-      if [[ "$HAVE_64_DEB" != "true" ]]; then
-        echo "Building on Linux x64 because we have no DEB"
-        export SHOULD_BUILD="yes"
-      fi
-      if [[ "$HAVE_64_TAR" != "true" ]]; then
-        echo "Building on Linux x64 because we have no TAR"
-        export SHOULD_BUILD="yes"
-      fi
-      if [[ "$SHOULD_BUILD" != "yes" ]]; then
-        echo "Already have all the Linux x64 builds"
+    elif [[ "$OS_NAME" == "linux" ]]; then
+      if [[ $VSCODE_ARCH == "arm64" ]]; then
+        HAVE_ARM64_DEB=$(echo $VSCODIUM_ASSETS | jq 'map(.name) | contains(["arm64.deb"])')
+        HAVE_ARM64_TAR=$(echo $VSCODIUM_ASSETS | jq --arg suffix "arm64-$LATEST_MS_TAG.tar.gz" 'map(.name) | contains([$suffix])')
+        if [[ "$HAVE_ARM64_DEB" != "true" ]]; then
+          echo "Building on Linux arm64 because we have no DEB"
+          export SHOULD_BUILD="yes"
+        fi
+        if [[ "$HAVE_ARM64_TAR" != "true" ]]; then
+          echo "Building on Linux arm64 because we have no TAR"
+          export SHOULD_BUILD="yes"
+        fi
+        if [[ "$SHOULD_BUILD" != "yes" ]]; then
+          echo "Already have all the Linux arm64 builds"
+        fi
+      elif [[ $VSCODE_ARCH == "armhf" ]]; then
+        HAVE_ARM_DEB=$(echo $VSCODIUM_ASSETS | jq 'map(.name) | contains(["armhf.deb"])')
+        HAVE_ARM_TAR=$(echo $VSCODIUM_ASSETS | jq --arg suffix "armhf-$LATEST_MS_TAG.tar.gz" 'map(.name) | contains([$suffix])')
+        if [[ "$HAVE_ARM_DEB" != "true" ]]; then
+          echo "Building on Linux arm because we have no DEB"
+          export SHOULD_BUILD="yes"
+        fi
+        if [[ "$HAVE_ARM_TAR" != "true" ]]; then
+          echo "Building on Linux arm because we have no TAR"
+          export SHOULD_BUILD="yes"
+        fi
+        if [[ "$SHOULD_BUILD" != "yes" ]]; then
+          echo "Already have all the Linux arm builds"
+        fi
+      else # Linux x64
+        HAVE_64_RPM=$(echo $VSCODIUM_ASSETS | jq 'map(.name) | contains(["x86_64.rpm"])')
+        HAVE_64_DEB=$(echo $VSCODIUM_ASSETS | jq 'map(.name) | contains(["amd64.deb"])')
+        HAVE_64_TAR=$(echo $VSCODIUM_ASSETS | jq --arg suffix "x64-$LATEST_MS_TAG.tar.gz" 'map(.name) | contains([$suffix])')
+        if [[ "$HAVE_64_RPM" != "true" ]]; then
+          echo "Building on Linux x64 because we have no RPM"
+          export SHOULD_BUILD="yes"
+        fi
+        if [[ "$HAVE_64_DEB" != "true" ]]; then
+          echo "Building on Linux x64 because we have no DEB"
+          export SHOULD_BUILD="yes"
+        fi
+        if [[ "$HAVE_64_TAR" != "true" ]]; then
+          echo "Building on Linux x64 because we have no TAR"
+          export SHOULD_BUILD="yes"
+        fi
+        if [[ "$SHOULD_BUILD" != "yes" ]]; then
+          echo "Already have all the Linux x64 builds"
+        fi
       fi
     fi
   else

get_repo.sh

@@ -9,8 +9,6 @@ echo "Got the latest MS tag: ${LATEST_MS_TAG}"
 git clone https://github.com/Microsoft/vscode.git --branch $LATEST_MS_TAG --depth 1
 
 # for GH actions
-if [[ "$CI_WINDOWS" != "True" ]]; then
-  echo "LATEST_MS_COMMIT=$LATEST_MS_COMMIT" >> $GITHUB_ENV
-  echo "LATEST_MS_TAG=$LATEST_MS_TAG" >> $GITHUB_ENV
-fi
+echo "LATEST_MS_COMMIT=$LATEST_MS_COMMIT" >> $GITHUB_ENV
+echo "LATEST_MS_TAG=$LATEST_MS_TAG" >> $GITHUB_ENV
 

icons/build_icons.sh

@@ -0,0 +1,51 @@
+#!/usr/bin/env bash
+
+check_programs() {
+    for arg in "$@"
+    do
+        if ! command -v $arg >/dev/null 2>&1
+		then
+			echo "$arg could not be found"
+			exit
+		fi
+    done
+}
+
+check_programs "icns2png" "composite" "convert" "png2icns" "icotool"
+
+for file in vscode/resources/darwin/*
+do
+	if [ -f "$file" ]; then
+		name=$(basename $file '.icns')
+
+		if [[ $name != 'code' ]] && [ ! -f "src/resources/darwin/$name.icns" ]; then
+			icns2png -x -s 512x512 $file -o .
+
+			composite -blend 100% -geometry +323+365 icons/corner_512.png "${name}_512x512x32.png" "$name.png"
+			composite icons/code_darwin.png "$name.png" "$name.png"
+
+			convert "$name.png" -resize 256x256 "${name}_256.png"
+
+			png2icns "src/resources/darwin/$name.icns" "$name.png" "${name}_256.png"
+
+			rm "${name}_512x512x32.png" "$name.png" "${name}_256.png"
+		fi
+	fi
+done
+
+for file in vscode/resources/win32/*.ico
+do
+	if [ -f "$file" ]; then
+		name=$(basename $file '.ico')
+
+		if [[ $name != 'code' ]] && [ ! -f "src/resources/win32/$name.ico" ]; then
+			icotool -x -w 256 $file
+
+			composite -geometry +150+185 icons/code_64.png "${name}_9_256x256x32.png" "${name}.png"
+
+			convert "${name}.png" -define icon:auto-resize=256,128,96,64,48,32,24,20,16 "src/resources/win32/$name.ico"
+
+			rm "${name}_9_256x256x32.png" "${name}.png"
+		fi
+	fi
+done

patches/no-replace-product-json.patch

@@ -0,0 +1,8 @@
+--- vscode/resources/linux/rpm/code.spec.template	2020-11-15 15:28:20.179070106 +0800
++++ vscode/resources/linux/rpm/code.spec.template.new	2020-11-15 15:25:39.269000000 +0800
+@@ -69,3 +69,5 @@
+ /usr/share/pixmaps/@@ICON@@.png
+ /usr/share/bash-completion/completions/@@NAME@@
+ /usr/share/zsh/site-functions/_@@NAME@@
++
++%config(noreplace) /usr/share/@@NAME@@/resources/app/product.json

patches/update-cache-path.patch

@@ -1,11 +1,11 @@
---- vscode/src/vs/platform/update/electron-main/updateService.win32.ts	2019-12-08 15:09:44.000000000 -0800
-+++ src/src/vs/platform/update/electron-main/updateService.win32.ts	2019-12-08 15:12:56.000000000 -0800
+--- vscode/src/vs/platform/update/electron-main/updateService.win32.ts	2021-02-05 11:59:17.564060663 -0600
++++ src/src/vs/platform/update/electron-main/updateService.win32.ts	2021-02-05 11:59:39.780745778 -0600
 @@ -55,7 +55,7 @@
  
  	@memoize
  	get cachePath(): Promise<string> {
 -		const result = path.join(tmpdir(), `vscode-update-${product.target}-${process.arch}`);
 +		const result = path.join(tmpdir(), `vscodium-update-${product.target}-${process.arch}`);
- 		return pfs.mkdirp(result, undefined).then(() => result);
+ 		return pfs.mkdirp(result).then(() => result);
  	}
  

prepare_vscode.sh

@@ -2,11 +2,6 @@
 
 set -e
 
-if [[ "$CI_WINDOWS" == "True" ]]; then
-  export npm_config_arch="$BUILDARCH"
-  export npm_config_target_arch="$BUILDARCH"
-fi
-
 cp -rp src/* vscode/
 cd vscode || exit
 
@@ -14,6 +9,7 @@ cd vscode || exit
 
 # apply patches
 patch -u src/vs/platform/update/electron-main/updateService.win32.ts -i ../patches/update-cache-path.patch
+patch -u resources/linux/rpm/code.spec.template -i ../patches/no-replace-product-json.patch
 
 if [[ "$OS_NAME" == "osx" ]]; then
   CHILD_CONCURRENCY=1 yarn --frozen-lockfile --ignore-optional
@@ -53,7 +49,7 @@ win32AppUserModelId='setpath(["win32AppUserModelId"]; "Microsoft.VSCodium")'
 win32ShellNameShort='setpath(["win32ShellNameShort"]; "VSCodium")'
 win32x64UserAppId='setpath (["win32x64UserAppId"]; "{{2E1F05D1-C245-4562-81EE-28188DB6FD17}")'
 urlProtocol='setpath(["urlProtocol"]; "vscodium")'
-extensionAllowedProposedApi='setpath(["extensionAllowedProposedApi"]; getpath(["extensionAllowedProposedApi"]) + ["ms-vsliveshare.vsliveshare", "ms-vscode-remote.remote-ssh"])'
+extensionAllowedProposedApi='setpath(["extensionAllowedProposedApi"]; getpath(["extensionAllowedProposedApi"]) + ["ms-vsliveshare.vsliveshare", "ms-vscode-remote.remote-ssh", "ms-vscode.cpptools", "ms-azuretools.vscode-docker", "visualstudioexptteam.vscodeintellicode", "ms-python.python"])'
 serverDataFolderName='setpath(["serverDataFolderName"]; ".vscode-server-oss")'
 
 product_json_changes="${checksumFailMoreInfoUrl} | ${tipsAndTricksUrl} | ${twitterUrl} | ${requestFeatureUrl} | ${documentationUrl} | ${introductoryVideosUrl} | ${extensionAllowedBadgeProviders} | ${updateUrl} | ${releaseNotesUrl} | ${keyboardShortcutsUrlMac} | ${keyboardShortcutsUrlLinux} | ${keyboardShortcutsUrlWin} | ${quality} | ${extensionsGallery} | ${linkProtectionTrustedDomains} | ${nameShort} | ${nameLong} | ${linuxIconName} | ${applicationName} | ${win32MutexName} | ${win32DirName} | ${win32NameVersion} | ${win32RegValueName} | ${win32AppUserModelId} | ${win32ShellNameShort} | ${win32x64UserAppId} | ${urlProtocol} | ${extensionAllowedProposedApi} | ${serverDataFolderName}"
@@ -68,6 +64,29 @@ if [[ "$OS_NAME" == "linux" ]]; then
   # as we are renaming the application to vscodium
   # we need to edit a line in the post install template
   sed -i "s/code-oss/codium/" resources/linux/debian/postinst.template
+  
+  # fix the packages metadata
+  # code.appdata.xml
+  sed -i 's|Visual Studio Code|VSCodium|g' resources/linux/code.appdata.xml
+  sed -i 's|https://code.visualstudio.com/docs/setup/linux|https://github.com/VSCodium/vscodium#download-install|' resources/linux/code.appdata.xml
+  sed -i 's|https://code.visualstudio.com/home/home-screenshot-linux-lg.png|https://vscodium.com/img/vscodium.png|' resources/linux/code.appdata.xml
+  sed -i 's|https://code.visualstudio.com|https://vscodium.com|' resources/linux/code.appdata.xml
+  
+  # control.template
+  sed -i 's|Microsoft Corporation <vscode-linux@microsoft.com>|VSCodium Team https://github.com/VSCodium/vscodium/graphs/contributors|'  resources/linux/debian/control.template
+  sed -i 's|https://code.visualstudio.com|https://vscodium.com|' resources/linux/debian/control.template
+  sed -i 's|Visual Studio Code|VSCodium|g' resources/linux/debian/control.template
+  sed -i 's|https://code.visualstudio.com/docs/setup/linux|https://github.com/VSCodium/vscodium#download-install|' resources/linux/debian/control.template
+  
+  # code.spec.template
+  sed -i 's|https://code.visualstudio.com/docs/setup/linux|https://github.com/VSCodium/vscodium#download-install|' resources/linux/rpm/code.spec.template
+  sed -i 's|Microsoft Corporation|VSCodium Team|' resources/linux/rpm/code.spec.template
+  sed -i 's|Visual Studio Code Team <vscode-linux@microsoft.com>|VSCodium Team https://github.com/VSCodium/vscodium/graphs/contributors|' resources/linux/rpm/code.spec.template
+  sed -i 's|https://code.visualstudio.com|https://vscodium.com|' resources/linux/rpm/code.spec.template
+  sed -i 's|Visual Studio Code|VSCodium|' resources/linux/rpm/code.spec.template
+  
+  # snapcraft.yaml
+  sed -i 's|Visual Studio Code|VSCodium|'  resources/linux/rpm/code.spec.template
 fi
 
 cd ..

src/src/vs/workbench/browser/media/code-icon.svg

@@ -1,19 +0,0 @@
-<svg width="1024" height="1024" viewBox="0 0 1024 1024" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M508.827 0.772461C224.654 0.772461 0.40625 305.969 0.40625 710.148L229.547 749.213C169.075 696.515 206.161 288.058 508.827 288.058C811.493 288.058 858.584 696.417 797.134 749.213L1023.37 710.148C1023.37 305.969 793.001 0.772461 508.827 0.772461Z" fill="#81DA56"/>
-<path d="M1023.39 707.988C1023.39 845.616 861.716 835.104 753.987 874.753C646.259 914.402 544.677 1023.77 511.891 1023.77C476.573 1023.77 323.282 888.651 272.129 874.753C177.65 841.24 0.390625 845.616 0.390625 707.988C0.390625 426.078 229.397 822.803 511.891 822.803C794.384 822.803 1023.39 426.078 1023.39 707.988Z" fill="#81DA56"/>
-<path d="M116.646 836.315C199.184 857.711 259.346 867.78 281.722 879.107C442.204 945.968 477.586 1021.56 509.669 1021.56C550.626 1021.56 578.994 843.184 578.994 843.184C465.003 803.607 384.094 670.917 194.953 615.54C194.953 615.54 56.6348 567.484 27.1417 598.443C-5.58102 675.828 -34.9724 794.619 116.646 836.315Z" fill="url(#paint0_linear)"/>
-<path d="M732.759 881.38C573.081 963.17 560.416 1015.19 507.22 1022.74C507.22 1022.74 488.789 1020.59 402.516 951.423C362.868 919.636 291.022 883.112 291.022 883.112C497.05 914.559 584.058 679.569 824.424 615.573C824.424 615.573 892.438 799.59 732.759 881.38Z" fill="#81DA56"/>
-<defs>
-<linearGradient id="paint0_linear" x1="297.596" y1="598.39" x2="420.618" y2="879.08" gradientUnits="userSpaceOnUse">
-<stop stop-color="#81DA56"/>
-<stop offset="0.233393" stop-color="#77D34A"/>
-<stop offset="0.433117" stop-color="#6BCD3C"/>
-<stop offset="0.580887" stop-color="#65C139"/>
-<stop offset="0.699298" stop-color="#60B338"/>
-<stop offset="0.838132" stop-color="#529F2D"/>
-<stop offset="0.928389" stop-color="#4B9726"/>
-<stop offset="1" stop-color="#3C7E1B"/>
-<stop offset="1" stop-color="#438E1F"/>
-</linearGradient>
-</defs>
-</svg>