Browse Source

(experiment) add logging and focus on mac only

Peter Squicciarini 4 years ago
parent
commit
6142ac4170
5 changed files with 28 additions and 17 deletions
  1. 14 14
      .travis.yml
  2. 8 3
      build.sh
  3. 2 0
      create_dmg.sh
  4. 2 0
      create_zip.sh
  5. 2 0
      get_repo.sh

+ 14 - 14
.travis.yml

@@ -1,17 +1,17 @@
 matrix:
   include:
-    - os: linux
-      sudo: required
-      env: BUILDARCH=x64
-      dist: trusty
-    - os: linux
-      sudo: required
-      env: BUILDARCH=arm64
-      dist: trusty
-    - os: linux
-      sudo: required
-      env: BUILDARCH=arm
-      dist: trusty
+    #     - os: linux
+    #       sudo: required
+    #       env: BUILDARCH=x64
+    #       dist: trusty
+    #     - os: linux
+    #       sudo: required
+    #       env: BUILDARCH=arm64
+    #       dist: trusty
+    #     - os: linux
+    #       sudo: required
+    #       env: BUILDARCH=arm
+    #       dist: trusty
     - os: osx
       addons:
         homebrew:
@@ -58,5 +58,5 @@ deploy:
     all_branches: true
     condition: $SHOULD_BUILD = yes
 
-after_deploy:
-  - ./update_version.sh
+    # after_deploy:
+    #   - ./update_version.sh

+ 8 - 3
build.sh

@@ -14,10 +14,15 @@ 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_target_arch="$BUILDARCH"
+#  export npm_config_arch="$BUILDARCH"
+#  export npm_config_target_arch="$BUILDARCH"
 
-  ./prepare_vscode.sh
+#  ./prepare_vscode.sh
+  yarn --version
+  node --version
+
+  CHILD_CONCURRENCY=1 yarn --frozen-lockfile
+  yarn postinstall
 
   cd vscode || exit
 

+ 2 - 0
create_dmg.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+set -x
+
 if [[ "$SHOULD_BUILD" == "yes" ]]; then
   if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
     cd VSCode-darwin

+ 2 - 0
create_zip.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -ex
+
 if [[ "$SHOULD_BUILD" == "yes" ]]; then
   if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
     cd VSCode-darwin

+ 2 - 0
get_repo.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -ex
+
 if [ -d vscode ]; then
   cd vscode 
   git fetch --all