Merge pull request #275 from stripedpajamas/rn-icon

Move code-icon.svg to updated path
2026-04-12 00:37:19 +10:00 · 2019-10-28 08:36:47 -07:00 · 2019-10-27 21:02:01 -07:00 · 2019-10-26 20:42:23 -07:00 · 2019-10-25 17:51:55 -07:00 · 2019-10-05 13:26:20 -07:00
5 changed files with 7 additions and 10 deletions
--- a/.travis.yml
+++ b/.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
--- a/build.sh
+++ b/build.sh
@@ -8,6 +8,10 @@ function keep_alive() {
 }

 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

@@ -42,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"])'
--- a/src/src/vs/workbench/contrib/update/electron-browser/media/code-icon.svg
+++ b/src/src/vs/workbench/contrib/update/electron-browser/media/code-icon.svg
--- a/trigger-azure.sh
+++ b/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
--- a/update_settings.sh
+++ b/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
Author	SHA1	Message	Date
Peter Squicciarini	cfc5bbd51e	Merge pull request #275 from stripedpajamas/rn-icon Move code-icon.svg to updated path	2019-10-28 08:36:47 -07:00
Peter Squicciarini	d3a7edee21	Move code-icon.svg to updated path	2019-10-27 21:02:01 -07:00
Peter Squicciarini	6bf38fa316	Merge pull request #274 from stripedpajamas/crash Update path to crash reporter setting	2019-10-26 20:42:23 -07:00
Peter Squicciarini	d203723bd5	Update path to crash reporter setting	2019-10-25 17:51:55 -07:00
Peter Squicciarini	880f505515	Merge pull request #258 from stripedpajamas/shell Remove & from win32ShellNameShort	2019-10-05 13:26:20 -07:00
Peter Squicciarini	8b57482521	Remove & from win32ShellNameShort	2019-10-05 13:13:11 -07:00
Peter Squicciarini	6d1b1c06bc	Merge pull request #257 from ajkerzner/ubuntu14 Update TravisCI config to use Ubuntu 14.04	2019-09-29 19:17:23 -07:00
Alex Kerzner	112b141bf2	Update TravisCI config to use Ubuntu 14.04	2019-09-29 10:12:09 -04:00
Peter Squicciarini	53b56dbebb	Merge pull request #251 from stripedpajamas/no-trigger Stop triggering Azure	2019-09-05 12:56:06 -07:00
Peter Squicciarini	cd6e1485b5	Stop triggering Azure	2019-09-04 15:39:23 -07:00
Peter Squicciarini	f787c21b3c	Merge pull request #244 from stripedpajamas/win-commit Set BUILD_SOURCEVERSION to LATEST_MS_COMMIT explicitly	2019-08-20 16:53:38 -07:00
Peter Squicciarini	74e4592337	Set BUILD_SOURCEVERSION to LATEST_MS_COMMIT explicitly	2019-08-20 15:17:17 -07:00