Merge pull request #275 from stripedpajamas/rn-icon

Move code-icon.svg to updated path

.travis.yml

@@ -3,6 +3,7 @@ matrix:
     - os: linux
       sudo: required
       env: BUILDARCH=x64
+      dist: trusty
     - os: osx
 
 language: node_js
@@ -17,7 +18,6 @@ before_install:
 
 script:
   - ./build.sh
-  - ./trigger-azure.sh
 
 before_deploy:
   - ./sign_mac_app.sh

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,6 +20,7 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
   ../update_settings.sh
 
   yarn
+  yarn postinstall
   mv product.json product.json.bak
 
   # set fields in product.json
@@ -33,7 +46,7 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
   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"])'
@@ -53,20 +66,40 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
     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 install --global create-dmg
-    npm run gulp -- "vscode-darwin-min"
+    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"
-    npm run gulp -- "vscode-win32-${BUILDARCH}-inno-updater"
-    npm run gulp -- "vscode-win32-${BUILDARCH}-system-setup"
-    npm run gulp -- "vscode-win32-${BUILDARCH}-user-setup"
-    npm run gulp -- "vscode-win32-${BUILDARCH}-archive"
+    yarn gulp "vscode-win32-${BUILDARCH}-min-ci"
+    yarn gulp "vscode-reh-win32-${BUILDARCH}-min-ci"
+    yarn gulp "vscode-reh-web-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"
   else # linux
-    npm run gulp -- "vscode-linux-${BUILDARCH}-min"
-    npm run gulp -- "vscode-linux-${BUILDARCH}-build-deb"
-    npm run gulp -- "vscode-linux-${BUILDARCH}-build-rpm"
+    yarn gulp vscode-linux-x64-min-ci
+    yarn gulp vscode-reh-linux-x64-min-ci
+    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
 

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