Merge pull request #275 from stripedpajamas/rn-icon

Move code-icon.svg to updated path

.travis.yml

@@ -3,17 +3,11 @@ matrix:
     - os: linux
       sudo: required
       env: BUILDARCH=x64
-    - os: linux
+      dist: trusty
-      sudo: required
-      env: BUILDARCH=ia32
-# arm64 builds don't work yet
-#    - os: linux
-#      sudo: required
-#      env: BUILDARCH=arm64
     - os: osx
 
 language: node_js
-node_js: "8"
+node_js: "10"
 
 before_install:
   - curl -o- -L https://yarnpkg.com/install.sh | bash
@@ -24,11 +18,11 @@ before_install:
 
 script:
   - ./build.sh
-  - ./trigger-azure.sh
 
 before_deploy:
   - ./sign_mac_app.sh
   - ./create_zip.sh
+  - ./create_dmg.sh
   - ./sum.sh
 
 deploy:
@@ -42,12 +36,10 @@ deploy:
     - ./*.sha256
     - ./*.zip
     - ./*.tar.gz
-    - vscode/.build/linux/deb/i386/deb/*.deb
+    - ./*.dmg
-    - vscode/.build/linux/rpm/i386/*.rpm
+    - ./*.deb
-    - vscode/.build/linux/deb/amd64/deb/*.deb
+    - ./*.rpm
-    - vscode/.build/linux/rpm/x86_64/*.rpm
+    - ./*.AppImage
-    - vscode/.build/linux/deb/arm64/deb/*.deb
-    - vscode/out/*.AppImage
   on:
     all_branches: true
     condition: $SHOULD_BUILD = yes

DOCS.md

@@ -80,18 +80,18 @@ $ defaults write com.visualstudio.code.oss ApplePressAndHoldEnabled -bool false
 ## <a id="terminal-support"></a>How do I open VSCodium from the terminal?
 
 - Go to the command palette (View | Command Palette...)
-- Choose `Shell command: Install 'vscodium' command in PATH`.
+- Choose `Shell command: Install 'codium' command in PATH`.
 
-![](https://user-images.githubusercontent.com/2707340/45751224-bd21a500-bbdf-11e8-8fb7-b645b97aae49.png)
+![](https://user-images.githubusercontent.com/2707340/60140295-18338a00-9766-11e9-8fda-b525b6f15c13.png)
 
 This allows you to open files or directories in VSCodium directly from your terminal:
 
 ```bash
-~/in-my-project $ vscodium . # open this directory
+~/in-my-project $ codium . # open this directory
-~/in-my-project $ vscodium file.txt # open this file
+~/in-my-project $ codium file.txt # open this file
 ```
 
-Feel free to alias this command to something easier to type in your shell profile (e.g. `alias code=vscodium`).
+Feel free to alias this command to something easier to type in your shell profile (e.g. `alias code=codium`).
 
 ## <a id="gentoo-overlay"></a>Gentoo ebuild/overlay
 

README.md

@@ -40,7 +40,7 @@ If you are on a Mac and have [Homebrew](https://brew.sh/) installed:
 brew cask install vscodium
 ```
 
-_Note: if you see "App can’t be opened because it is from an unidentified developer" 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 a Mac._
+_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._
 
 #### <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)):
@@ -77,7 +77,7 @@ 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 VSCode.
 
-Microsoft's build process does download additional files. This was brought up in [Microsoft/vscode#49159](https://github.com/Microsoft/vscode/issues/49159) 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. This was brought up in [Microsoft/vscode#49159](https://github.com/Microsoft/vscode/issues/49159) and [Microsoft/vscode#45978](https://github.com/Microsoft/vscode/issues/45978). These are the packages downloaded during build:
 
 - Extensions from the Microsoft Marketplace:
   - ms-vscode.node-debug2
@@ -87,14 +87,22 @@ Microsoft's build process does download additional files. This was brought up in
   - ffmpeg
 
 ## <a id="more-info"></a>More Info
+
+### 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.
 
+### Extension Licensing
 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 [`.travis.yml` file](https://github.com/VSCodium/vscodium/blob/master/.travis.yml) (for Linux and OS X builds) and the [`win32-build.yml` file](https://github.com/VSCodium/vscodium/blob/master/win32-build.yml) (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. To examine the build logs, go [here for Linux / OS X](https://travis-ci.com/VSCodium/vscodium) and [here for Windows](https://dev.azure.com/vscodium/VSCodium/_build?definitionId=1)
+
 ## <a id="supported-os"></a>Supported OS
-- [x] OSX x64 (zipped app file)
+- [x] OS X (`zip`, `dmg`)
-- [x] Linux x64 (`.deb`, `.rpm`, `AppImage`, and `.tar.gz` files)
+- [x] Linux x64 (`deb`, `rpm`, `AppImage`, `tar.gz`)
-- [x] Linux x86 (`.deb`, `.rpm`, and `.tar.gz` files)
+- [x] Linux x86 (`deb`, `rpm`, `tar.gz`)
 - [x] Windows x64
 - [x] Windows x86
   

VSCodium-AppImage-Recipe.yml

@@ -12,18 +12,18 @@ ingredients:
     - code
     - libgconf2-4
   dist: trusty
-  sources: 
+  sources:
     - deb http://archive.ubuntu.com/ubuntu/ trusty main universe
   script:
     - pwd
     - cp ../.build/linux/deb/amd64/deb/*.deb .
-    - ls vscodium_*.deb | cut -d _ -f 2 > VERSION
+    - ls codium_*.deb | cut -d _ -f 2 > VERSION
 
 script:
-  - sed -i -e 's|/usr/share/vscodium/||g' usr/share/applications/vscodium.desktop
+  - sed -i -e 's|/usr/share/codium/||g' usr/share/applications/codium.desktop
-  - sed -i -e 's|com.visualstudio.code.oss|vscodium|g' usr/share/applications/vscodium.desktop
+  - sed -i -e 's|com.visualstudio.code.oss|vscodium|g' usr/share/applications/codium.desktop
-  - cp usr/share/applications/vscodium.desktop .
+  - cp usr/share/applications/codium.desktop .
-  - cp usr/share/pixmaps/com.visualstudio.code.oss.png vscodium.png
+  - cp usr/share/pixmaps/vscodium.png vscodium.png
   - convert vscodium.png -resize 512x512 usr/share/icons/hicolor/512x512/apps/vscodium.png
   - convert vscodium.png -resize 256x256 usr/share/icons/hicolor/256x256/apps/vscodium.png
   - convert vscodium.png -resize 128x128 usr/share/icons/hicolor/128x128/apps/vscodium.png
@@ -32,4 +32,4 @@ script:
   - convert vscodium.png -resize 32x32 usr/share/icons/hicolor/32x32/apps/vscodium.png
   - convert vscodium.png -resize 24x24 usr/share/icons/hicolor/24x24/apps/vscodium.png
   - convert vscodium.png -resize 22x22 usr/share/icons/hicolor/22x22/apps/vscodium.png
-  - ( cd usr/bin/ ; ln -s ../share/vscodium/vscodium  . )
+  - ( cd usr/bin/ ; ln -s ../share/codium/codium  . )

build.sh

@@ -1,5 +1,17 @@
 #!/bin/bash
+
+function keep_alive() {
+  while true; do
+    date
+    sleep 60
+  done
+}
+
 if [[ "$SHOULD_BUILD" == "yes" ]]; then
+  export BUILD_SOURCEVERSION=$LATEST_MS_COMMIT
+  echo "LATEST_MS_COMMIT: ${LATEST_MS_COMMIT}"
+  echo "BUILD_SOURCEVERSION: ${BUILD_SOURCEVERSION}"
+
   cp -rp src/* vscode/
   cd vscode
 
@@ -8,28 +20,38 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
   ../update_settings.sh
 
   yarn
+  yarn postinstall
   mv product.json product.json.bak
 
   # set fields in product.json
+  tipsAndTricksUrl='setpath(["tipsAndTricksUrl"]; "https://go.microsoft.com/fwlink/?linkid=852118")'
+  twitterUrl='setpath(["twitterUrl"]; "https://go.microsoft.com/fwlink/?LinkID=533687")'
+  requestFeatureUrl='setpath(["requestFeatureUrl"]; "https://go.microsoft.com/fwlink/?LinkID=533482")'
+  documentationUrl='setpath(["documentationUrl"]; "https://go.microsoft.com/fwlink/?LinkID=533484#vscode")'
+  introductoryVideosUrl='setpath(["introductoryVideosUrl"]; "https://go.microsoft.com/fwlink/?linkid=832146")'
+  extensionAllowedBadgeProviders='setpath(["extensionAllowedBadgeProviders"]; ["api.bintray.com", "api.travis-ci.com", "api.travis-ci.org", "app.fossa.io", "badge.fury.io", "badge.waffle.io", "badgen.net", "badges.frapsoft.com", "badges.gitter.im", "badges.greenkeeper.io", "cdn.travis-ci.com", "cdn.travis-ci.org", "ci.appveyor.com", "circleci.com", "cla.opensource.microsoft.com", "codacy.com", "codeclimate.com", "codecov.io", "coveralls.io", "david-dm.org", "deepscan.io", "dev.azure.com", "flat.badgen.net", "gemnasium.com", "githost.io", "gitlab.com", "godoc.org", "goreportcard.com", "img.shields.io", "isitmaintained.com", "marketplace.visualstudio.com", "nodesecurity.io", "opencollective.com", "snyk.io", "travis-ci.com", "travis-ci.org", "visualstudio.com", "vsmarketplacebadge.apphb.com", "www.bithound.io", "www.versioneye.com"])'
+  updateUrl='setpath(["updateUrl"]; "https://vscodium.now.sh")'
+  releaseNotesUrl='setpath(["releaseNotesUrl"]; "https://go.microsoft.com/fwlink/?LinkID=533483#vscode")'
+  keyboardShortcutsUrlMac='setpath(["keyboardShortcutsUrlMac"]; "https://go.microsoft.com/fwlink/?linkid=832143")'
+  keyboardShortcutsUrlLinux='setpath(["keyboardShortcutsUrlLinux"]; "https://go.microsoft.com/fwlink/?linkid=832144")'
+  keyboardShortcutsUrlWin='setpath(["keyboardShortcutsUrlWin"]; "https://go.microsoft.com/fwlink/?linkid=832145")'
   quality='setpath(["quality"]; "stable")'
   extensionsGallery='setpath(["extensionsGallery"]; {"serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery", "cacheUrl": "https://vscode.blob.core.windows.net/gallery/index", "itemUrl": "https://marketplace.visualstudio.com/items"})'
   nameShort='setpath(["nameShort"]; "VSCodium")'
   nameLong='setpath(["nameLong"]; "VSCodium")'
-  applicationName='setpath(["applicationName"]; "vscodium")'
+  linuxIconName='setpath(["linuxIconName"]; "vscodium")'
+  applicationName='setpath(["applicationName"]; "codium")'
   win32MutexName='setpath(["win32MutexName"]; "vscodium")'
   win32DirName='setpath(["win32DirName"]; "VSCodium")'
   win32NameVersion='setpath(["win32NameVersion"]; "VSCodium")'
   win32RegValueName='setpath(["win32RegValueName"]; "VSCodium")'
   win32AppUserModelId='setpath(["win32AppUserModelId"]; "Microsoft.VSCodium")'
-  win32ShellNameShort='setpath(["win32ShellNameShort"]; "V&SCodium")'
+  win32ShellNameShort='setpath(["win32ShellNameShort"]; "VSCodium")'
   win32x64UserAppId='setpath (["win32x64UserAppId"]; "{{2E1F05D1-C245-4562-81EE-28188DB6FD17}")'
   urlProtocol='setpath(["urlProtocol"]; "vscodium")'
   extensionAllowedProposedApi='setpath(["extensionAllowedProposedApi"]; getpath(["extensionAllowedProposedApi"]) + ["ms-vsliveshare.vsliveshare"])'
-  keyboardShortcutsUrlMac='setpath(["keyboardShortcutsUrlMac"]; "https://go.microsoft.com/fwlink/?linkid=832143")'
-  keyboardShortcutsUrlLinux='setpath(["keyboardShortcutsUrlLinux"]; "https://go.microsoft.com/fwlink/?linkid=832144")'
-  keyboardShortcutsUrlWin='setpath(["keyboardShortcutsUrlWin"]; "https://go.microsoft.com/fwlink/?linkid=832145")'
 
-  product_json_changes="${keyboardShortcutsUrlMac} | ${keyboardShortcutsUrlLinux} | ${keyboardShortcutsUrlWin} | ${quality} | ${extensionsGallery} | ${nameShort} | ${nameLong} | ${applicationName} | ${win32MutexName} | ${win32DirName} | ${win32NameVersion} | ${win32RegValueName} | ${win32AppUserModelId} | ${win32ShellNameShort} | ${win32x64UserAppId} | ${urlProtocol} | ${extensionAllowedProposedApi}"
+  product_json_changes="${tipsAndTricksUrl} | ${twitterUrl} | ${requestFeatureUrl} | ${documentationUrl} | ${introductoryVideosUrl} | ${extensionAllowedBadgeProviders} | ${updateUrl} | ${releaseNotesUrl} | ${keyboardShortcutsUrlMac} | ${keyboardShortcutsUrlLinux} | ${keyboardShortcutsUrlWin} | ${quality} | ${extensionsGallery} | ${nameShort} | ${nameLong} | ${linuxIconName} | ${applicationName} | ${win32MutexName} | ${win32DirName} | ${win32NameVersion} | ${win32RegValueName} | ${win32AppUserModelId} | ${win32ShellNameShort} | ${win32x64UserAppId} | ${urlProtocol} | ${extensionAllowedProposedApi}"
   cat product.json.bak | jq "${product_json_changes}" > product.json
   cat product.json
   ../undo_telemetry.sh
@@ -41,22 +63,43 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
     # unless the app name is code-oss
     # as we are renaming the application to vscodium
     # we need to edit a line in the post install template
-    sed -i "s/code-oss/vscodium/" resources/linux/debian/postinst.template
+    sed -i "s/code-oss/codium/" resources/linux/debian/postinst.template
   fi
 
+  yarn gulp compile-build
+  yarn gulp compile-extensions-build
+
+  # this task is very slow on mac, so using a keep alive to keep travis alive
+  keep_alive &
+  KA_PID=$!
+  yarn gulp minify-vscode
+  kill $KA_PID
+
+  yarn gulp minify-vscode-reh
+  yarn gulp minify-vscode-reh-web
+
   if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-    npm run gulp -- "vscode-darwin-min"
+    npm install --global create-dmg
+    yarn gulp vscode-darwin-min-ci
+    yarn gulp vscode-reh-darwin-min-ci
+    yarn gulp vscode-reh-web-darwin-min-ci
   elif [[ "$CI_WINDOWS" == "True" ]]; then
     cp LICENSE.txt LICENSE.rtf # windows build expects rtf license
-    npm run gulp -- "vscode-win32-${BUILDARCH}-min"
+    yarn gulp "vscode-win32-${BUILDARCH}-min-ci"
-    npm run gulp -- "vscode-win32-${BUILDARCH}-inno-updater"
+    yarn gulp "vscode-reh-win32-${BUILDARCH}-min-ci"
-    npm run gulp -- "vscode-win32-${BUILDARCH}-system-setup"
+    yarn gulp "vscode-reh-web-win32-${BUILDARCH}-min-ci"
-    npm run gulp -- "vscode-win32-${BUILDARCH}-user-setup"
+    yarn gulp "vscode-win32-${BUILDARCH}-code-helper"
-    npm run gulp -- "vscode-win32-${BUILDARCH}-archive"
+    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"
   else # linux
-    npm run gulp -- "vscode-linux-${BUILDARCH}-min"
+    yarn gulp vscode-linux-x64-min-ci
-    npm run gulp -- "vscode-linux-${BUILDARCH}-build-deb"
+    yarn gulp vscode-reh-linux-x64-min-ci
-    npm run gulp -- "vscode-linux-${BUILDARCH}-build-rpm"
+    yarn gulp vscode-reh-web-linux-x64-min-ci
+
+    yarn gulp "vscode-linux-${BUILDARCH}-build-deb"
+    yarn gulp "vscode-linux-${BUILDARCH}-build-rpm"
     . ../create_appimage.sh
   fi
 

check_tags.sh

@@ -15,25 +15,6 @@ if [ "$GITHUB_TOKEN" != "" ]; then
         echo "Building on Mac because we have no ZIP"
         export SHOULD_BUILD="yes"
       fi
-    elif [[ $BUILDARCH == "ia32" ]]; then
-      HAVE_IA32_RPM=$(echo $VSCODIUM_ASSETS | jq 'map(.name) | contains(["i386.rpm"])')
-      HAVE_IA32_DEB=$(echo $VSCODIUM_ASSETS | jq 'map(.name) | contains(["i386.deb"])')
-      HAVE_IA32_TAR=$(echo $VSCODIUM_ASSETS | jq --arg suffix "ia32-$LATEST_MS_TAG.tar.gz" 'map(.name) | contains([$suffix])')
-      if [[ "$HAVE_IA32_RPM" != "true" ]]; then
-        echo "Building on Linux ia32 because we have no RPM"
-        export SHOULD_BUILD="yes"
-      fi
-      if [[ "$HAVE_IA32_DEB" != "true" ]]; then
-        echo "Building on Linux ia32 because we have no DEB"
-        export SHOULD_BUILD="yes"
-      fi
-      if [[ "$HAVE_IA32_TAR" != "true" ]]; then
-        echo "Building on Linux ia32 because we have no TAR"
-        export SHOULD_BUILD="yes"
-      fi
-      if [[ "$SHOULD_BUILD" != "yes" ]]; then
-        echo "Already have all the Linux ia32 builds"
-      fi
     elif [[ $BUILDARCH == "arm64" ]]; then
       # HAVE_ARM64_RPM=$(echo $VSCODIUM_ASSETS | jq 'map(.name) | contains(["arm64.rpm"])')
       HAVE_ARM64_DEB=$(echo $VSCODIUM_ASSETS | jq 'map(.name) | contains(["arm64.deb"])')

create_dmg.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+if [[ "$SHOULD_BUILD" == "yes" ]]; then
+  if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+    cd VSCode-darwin
+    create-dmg VSCodium.app ..
+  fi
+  cd ..
+fi

create_zip.sh

@@ -4,9 +4,6 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
   if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
     cd VSCode-darwin
     zip -r -X -y ../VSCodium-darwin-${LATEST_MS_TAG}.zip ./*.app
-  elif [[ "$BUILDARCH" == "ia32" ]]; then
-    cd VSCode-linux-ia32
-    tar czf ../VSCodium-linux-ia32-${LATEST_MS_TAG}.tar.gz .
   elif [[ "$BUILDARCH" == "arm64" ]]; then
     cd VSCode-linux-arm64
     tar czf ../VSCodium-linux-arm64-${LATEST_MS_TAG}.tar.gz .

install_deps.sh

@@ -6,22 +6,7 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
 else
   sudo apt-get update
   sudo apt-get install -y fakeroot rpm jq
-  if [[ "$BUILDARCH" == "ia32" ]]; then
+  if [[ $BUILDARCH == "arm64" ]]; then
-    sudo dpkg --add-architecture i386
-    sudo apt-get update
-    sudo apt-get install -y gcc-multilib g++-multilib
-    sudo apt-get install -y \
-      libgirepository-1.0-1:i386 \
-      gir1.2-glib-2.0:i386 \
-      libglib2.0-dev:i386 \
-      gir1.2-secret-1:i386 \
-      libx11-dev:i386 \
-      libxkbfile-dev:i386 \
-      libsecret-1-dev:i386
-    export CFLAGS=-m32
-    export CXXFLAGS=-m32
-    export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig
-  elif [[ $BUILDARCH == "arm64" ]]; then
     echo "deb http://ports.ubuntu.com/ubuntu-ports/ trusty main" | sudo tee -a /etc/apt/sources.list.d/arm64.list >/dev/null
     sudo dpkg --add-architecture arm64
     sudo apt-get update

sum.sh

@@ -1,27 +1,39 @@
 #!/bin/bash
 
+# shasum blows up in Azure, so using this
+# node package which has similar syntax and identical output
+if [[ "$CI_WINDOWS" == "True" ]]; then
+  npm i -g checksum
+fi
+
 sum_file () {
   if [[ -f "$1" ]]; then
-    shasum -a 256 $1 > $1.sha256
+    if [[ "$CI_WINDOWS" == "True" ]]; then
-    shasum $1 > $1.sha1
+      checksum -a sha256 "$1" > "$1".sha256
+      checksum -a sha1 "$1" > "$1".sha1
+    else
+      shasum -a 256 "$1" > "$1".sha256
+      shasum "$1" > "$1".sha1
+    fi
   fi
 }
 
 if [[ "$SHOULD_BUILD" == "yes" ]]; then
   if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
     sum_file VSCodium-darwin-*.zip
+    sum_file VSCodium*.dmg
+  elif [[ "$CI_WINDOWS" == "True" ]]; then
+    sum_file VSCodiumSetup-*.exe
+    sum_file VSCodiumUserSetup-*.exe
+    sum_file VSCodium-win32-*.zip
   else # linux
-    if [[ "$BUILDARCH" == "x64" ]]; then
+    cp vscode/out/*.AppImage .
-      deb_arch=amd64
+    cp vscode/.build/linux/deb/amd64/deb/*.deb .
-      rpm_arch=x86_64
+    cp vscode/.build/linux/rpm/x86_64/*.rpm .
-    elif [[ "$BUILDARCH" == "ia32" ]]; then
+
-      deb_arch=i386
+    sum_file *.AppImage
-      rpm_arch=i386
-    fi
     sum_file VSCodium-linux*.tar.gz
-    sum_file vscode/.build/linux/deb/${deb_arch}/deb/*.deb
+    sum_file *.deb
-    sum_file vscode/.build/linux/rpm/${rpm_arch}/*.rpm
+    sum_file *.rpm
-    cp vscode/.build/linux/deb/${deb_arch}/deb/*.sha256 .
-    cp vscode/.build/linux/rpm/${rpm_arch}/*.sha256 .
   fi
 fi

trigger-azure.sh

@@ -1,7 +0,0 @@
-if [ "$AZURE_TOKEN" != "" ]; then
-  if [[ "$SHOULD_BUILD" == "yes" ]]; then
-    if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-      curl -X POST -H "Content-Type: application/json" -H "Authorization: Basic $AZURE_TOKEN" -d '{"definition":{"id":1}}' https://dev.azure.com/VSCodium/vscodium/_apis/build/builds?api-version=5.0-preview.5
-    fi
-  fi
-fi

update_settings.sh

@@ -46,4 +46,4 @@ update_setting () {
 }
 
 update_setting "$TELEMETRY_ENABLE" src/vs/platform/telemetry/common/telemetryService.ts
-update_setting "$TELEMETRY_CRASH_REPORTER" src/vs/workbench/electron-browser/main.contribution.ts
+update_setting "$TELEMETRY_CRASH_REPORTER" src/vs/workbench/electron-browser/desktop.contribution.ts

update_version.sh

@@ -26,68 +26,121 @@ fi
 
 URL_BASE=https://github.com/VSCodium/vscodium/releases/download/${LATEST_MS_TAG}
 
+# to make testing on forks easier
+if [[ "$CI_WINDOWS" == "True" ]]; then
+  # BUILD_REPOSITORY_URI = e.g. https://github.com/VSCodium/vscodium
+  VERSIONS_REPO=$(echo ${BUILD_REPOSITORY_URI} | awk -F"/" '{ print $4 }')/versions
+
+  git config --global core.autocrlf true
+else
+  # TRAVIS_REPO_SLUG = e.g. VSCodium/vscodium
+  VERSIONS_REPO=$(echo ${TRAVIS_REPO_SLUG} | awk -F"/" '{ print $1 }')/versions
+fi
+
+# generateJson <assetName>
+# e.g. generateJson VSCodium-darwin-1.33.0.zip
+generateJson() {
+  local assetName=$1
+
+  # generate parts
+  local url=${URL_BASE}/${assetName}
+  local name=$LATEST_MS_TAG
+  local version=$LATEST_MS_COMMIT
+  local productVersion=$LATEST_MS_TAG
+  local timestamp=$(node -e 'console.log(Date.now())')
+
+  local sha1hash=$(cat ${assetName}.sha1 | awk '{ print $1 }')
+  local sha256hash=$(cat ${assetName}.sha256 | awk '{ print $1 }')
+
+  # check that nothing is blank (blank indicates something awry with build)
+  for key in url name version productVersion sha1hash timestamp sha256hash; do
+    if [[ "${!key}" == "" ]]; then
+      echo "Missing data for version update; exiting..."
+      exit 1
+    fi
+  done
+
+  # generate json
+  local json=$(jq \
+    --arg url             "${url}" \
+    --arg name            "${name}" \
+    --arg version         "${version}" \
+    --arg productVersion  "${productVersion}" \
+    --arg hash            "${sha1hash}" \
+    --arg timestamp       "${timestamp}" \
+    --arg sha256hash      "${sha256hash}" \
+    '. | .url=$url | .name=$name | .version=$version | .productVersion=$productVersion | .hash=$hash | .timestamp=$timestamp | .sha256hash=$sha256hash' \
+    <<<'{}')
+
+  echo "$json"
+}
+
+updateLatestVersion() {
+  cd versions
+
+  local versionPath=$1
+  local json=$2
+
+  # create/update the latest.json file in the correct location
+  mkdir -p $versionPath
+  echo $json > $versionPath/latest.json
+
+  cd ..
+}
+
+# init versions repo for later commiting + pushing the json file to it
+# thank you https://www.vinaygopinath.me/blog/tech/commit-to-master-branch-on-github-using-travis-ci/
+git clone https://github.com/${VERSIONS_REPO}.git
+cd versions
+git config user.email "vscodium-ci@not-real.com"
+git config user.name "VSCodium CI"
+git remote rm origin
+git remote add origin https://${GITHUB_USERNAME}:${GITHUB_TOKEN}@github.com/${VERSIONS_REPO}.git > /dev/null 2>&1
+cd ..
+
 if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
   # zip, sha1, and sha256 files are all at top level dir
-  ASSET_PATH=.
   ASSET_NAME=VSCodium-darwin-${LATEST_MS_TAG}.zip
   VERSION_PATH="darwin"
+  JSON="$(generateJson ${ASSET_NAME})"
+  updateLatestVersion "$VERSION_PATH" "$JSON"
 elif [[ "$CI_WINDOWS" == "True" ]]; then
-  # TODO: make this logic work for Windows builds too
+  # system installer
-  # or re-implement it in PowerShell and call that from the Windows build
+  ASSET_NAME=VSCodiumSetup-${BUILDARCH}-${LATEST_MS_TAG}.exe
-  exit
+  VERSION_PATH="win32/${BUILDARCH}/system"
+  JSON="$(generateJson ${ASSET_NAME})"
+  updateLatestVersion "$VERSION_PATH" "$JSON"
+
+  # user installer
+  ASSET_NAME=VSCodiumUserSetup-${BUILDARCH}-${LATEST_MS_TAG}.exe
+  VERSION_PATH="win32/${BUILDARCH}/user"
+  JSON="$(generateJson ${ASSET_NAME})"
+  updateLatestVersion "$VERSION_PATH" "$JSON"
+
+  # windows archive
+  ASSET_NAME=VSCodium-win32-${BUILDARCH}-${LATEST_MS_TAG}.zip
+  VERSION_PATH="win32/${BUILDARCH}/archive"
+  JSON="$(generateJson ${ASSET_NAME})"
+  updateLatestVersion "$VERSION_PATH" "$JSON"
 else # linux
   # update service links to tar.gz file
   # see https://update.code.visualstudio.com/api/update/linux-x64/stable/VERSION
-  # and https://update.code.visualstudio.com/api/update/linux-ia32/stable/VERSION
   # as examples
-  ASSET_PATH=.
   ASSET_NAME=VSCodium-linux-${BUILDARCH}-${LATEST_MS_TAG}.tar.gz
   VERSION_PATH="linux/${BUILDARCH}"
+  JSON="$(generateJson ${ASSET_NAME})"
+  updateLatestVersion "$VERSION_PATH" "$JSON"
 fi
 
-# generate parts
-url=${URL_BASE}/${ASSET_NAME}
-name=$LATEST_MS_TAG
-version=$LATEST_MS_COMMIT
-productVersion=$LATEST_MS_TAG
-sha1hash=$(cat ${ASSET_PATH}/${ASSET_NAME}.sha1 | awk '{ print $ 1 }')
-timestamp=$(node -e 'console.log(Date.now())')
-sha256hash=$(cat ${ASSET_PATH}/${ASSET_NAME}.sha256 | awk '{ print $ 1 }')
-
-# check that nothing is blank (blank indicates something awry with build)
-for key in url name version productVersion sha1hash timestamp sha256hash; do
-  if [[ "${!key}" == "" ]]; then
-    echo "Missing data for version update; exiting..."
-    exit 1
-  fi
-done
-
-# generate json
-JSON=$(jq \
-  --arg url             "${url}" \
-  --arg name            "${name}" \
-  --arg version         "${version}" \
-  --arg productVersion  "${productVersion}" \
-  --arg hash            "${sha1hash}" \
-  --arg timestamp       "${timestamp}" \
-  --arg sha256hash      "${sha256hash}" \
-  '. | .url=$url | .name=$name | .version=$version | .productVersion=$productVersion | .hash=$hash | .timestamp=$timestamp | .sha256hash=$sha256hash' \
-  <<<'{}')
-
-echo $JSON
-
-# clone down the current versions repo
-# create/update the latest.json file in the correct location
-# commit and push (thank you https://www.vinaygopinath.me/blog/tech/commit-to-master-branch-on-github-using-travis-ci/)
-git clone https://github.com/VSCodium/versions.git
 cd versions
-git config user.email "travis@travis-ci.org"
+
-git config user.name "Travis CI"
+git pull origin master # in case another build just pushed
-mkdir -p $VERSION_PATH
+git add .
-echo $JSON > $VERSION_PATH/latest.json
-git add $VERSION_PATH
 dateAndMonth=`date "+%D %T"`
 git commit -m "Travis update: $dateAndMonth (Build $TRAVIS_BUILD_NUMBER)"
-git remote rm origin
+if ! git push origin master --quiet; then
-git remote add origin https://${GITHUB_USERNAME}:${GITHUB_TOKEN}@github.com/VSCodium/versions.git > /dev/null 2>&1
+  git pull origin master
-git push origin master --quiet
+  git push origin master --quiet
+fi
+
+cd ..

win32-build.yml

@@ -1,7 +1,7 @@
 steps:
 - task: NodeTool@0 
   inputs:
-    versionSpec: '8.x'
+    versionSpec: '10.x'
 - script: |
     choco install jq 
   displayName: 'install jq from choco'
@@ -16,9 +16,12 @@ steps:
   inputs: 
     scriptPath: get_repo.sh
 - powershell: |
+    $LATEST_MS_COMMIT="$(git -C vscode rev-list --tags --max-count=1)"
     $LATEST_MS_TAG="$(git -C vscode describe --tags)"
     Write-Host "##vso[task.setvariable variable=LATEST_MS_TAG]$LATEST_MS_TAG"
-  displayName: 'set env LATEST_MS_TAG'
+    Write-Host "##vso[task.setvariable variable=LATEST_MS_COMMIT]$LATEST_MS_COMMIT"
+    Write-Host "##vso[task.setvariable variable=BUILD_SOURCEVERSION]$LATEST_MS_COMMIT"
+  displayName: 'set env LATEST_MS_TAG, LATEST_MS_COMMIT'
 - task: PowerShell@2
   inputs:
     filePath: 'check_tags.ps1'
@@ -40,9 +43,7 @@ steps:
     if [[ "$SHOULD_BUILD" == "yes" ]]; then mv vscode\\.build\\win32-$(BUILDARCH)\\archive\\VSCode-win32-$(BUILDARCH).zip VSCodium-win32-$(BUILDARCH)-${LATEST_MS_TAG}.zip; fi
   displayName: 'move the zip folder'
 - powershell: |
-    Get-FileHash VSCodiumSetup-$(BUILDARCH)-$(LATEST_MS_TAG).exe -Algorithm SHA256 | Format-List > VSCodiumSetup-$(BUILDARCH)-$(LATEST_MS_TAG).sha256
+    bash ./sum.sh
-    Get-FileHash VSCodiumUserSetup-$(BUILDARCH)-$(LATEST_MS_TAG).exe -Algorithm SHA256 | Format-List > VSCodiumUserSetup-$(BUILDARCH)-$(LATEST_MS_TAG).sha256
-    Get-FileHash VSCodium-win32-$(BUILDARCH)-$(LATEST_MS_TAG).zip -Algorithm SHA256 | Format-List > VSCodium-win32-$(BUILDARCH)-$(LATEST_MS_TAG).sha256
   condition: eq(variables['SHOULD_BUILD'], 'yes')
   displayName: 'compute sums'
 - task: CopyFiles@2
@@ -61,3 +62,8 @@ steps:
   inputs:
     PathtoPublish: $(Build.ArtifactStagingDirectory)
     ArtifactName: 'everything'
+- bash: ./update_version.sh
+  displayName: 'update version json'
+  env:
+    GITHUB_TOKEN: $(GITHUB_TOKEN)
+    GITHUB_USERNAME: $(GITHUB_USERNAME)