(experiment) use later version of xcode

.travis.yml

@@ -1,25 +1,25 @@
-#jobs:
+jobs:
-#  include:
+  include:
-    #     - os: linux
+    - os: linux
-    #       sudo: required
+      sudo: required
-    #       env: BUILDARCH=x64
+      env: BUILDARCH=x64
-    #       dist: trusty
+      dist: trusty
-    #     - os: linux
+    - os: linux
-    #       sudo: required
+      sudo: required
-    #       env: BUILDARCH=arm64
+      env: BUILDARCH=arm64
-    #       dist: trusty
+      dist: trusty
-    #     - os: linux
+    - os: linux
-    #       sudo: required
+      sudo: required
-    #       env: BUILDARCH=arm
+      env: BUILDARCH=arm
-    #       dist: trusty
+      dist: trusty
-os: osx
+    - os: osx
-addons:
+      osx_image: xcode12
-  homebrew:
+      addons:
-    packages:
+        homebrew:
-      - create-dmg
+          packages:
-      - jq
+            - jq
-      - zip
+            - zip
-    update: true
+          update: true
 
 language: node_js
 node_js: "12.14.1"

build.sh

@@ -14,19 +14,13 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
   echo "LATEST_MS_COMMIT: ${LATEST_MS_COMMIT}"
   echo "BUILD_SOURCEVERSION: ${BUILD_SOURCEVERSION}"
 
-#  export npm_config_arch="$BUILDARCH"
+  export npm_config_arch="$BUILDARCH"
-#  export npm_config_target_arch="$BUILDARCH"
+  export npm_config_target_arch="$BUILDARCH"
+
+  ./prepare_vscode.sh
 
-#  ./prepare_vscode.sh
   cd vscode || exit
 
-  yarn --version
-  node --version
-
-  CHILD_CONCURRENCY=1 yarn --frozen-lockfile
-  yarn postinstall
-
-
   # these tasks are very slow, so using a keep alive to keep travis alive
   keep_alive &
 

prepare_vscode.sh

@@ -5,7 +5,7 @@ set -e
 export npm_config_arch="$BUILDARCH"
 export npm_config_target_arch="$BUILDARCH"
 
-# cp -rp src/* vscode/
+cp -rp src/* vscode/
 cd vscode || exit
 
 # ../update_settings.sh
@@ -23,7 +23,7 @@ if [[ "$BUILDARCH" == *"arm"* ]]; then
   npx electron-rebuild -f -w vscode-sqlite3
 fi
 
-# mv product.json product.json.bak
+mv product.json product.json.bak
 
 # set fields in product.json
 tipsAndTricksUrl='setpath(["tipsAndTricksUrl"]; "https://go.microsoft.com/fwlink/?linkid=852118")'
@@ -56,7 +56,7 @@ extensionAllowedProposedApi='setpath(["extensionAllowedProposedApi"]; getpath(["
 serverDataFolderName='setpath(["serverDataFolderName"]; ".vscode-server-oss")'
 
 product_json_changes="${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}"
-# cat product.json.bak | jq "${product_json_changes}" > product.json
+cat product.json.bak | jq "${product_json_changes}" > product.json
 cat product.json
 
 # ../undo_telemetry.sh