diff --git a/.travis.yml b/.travis.yml index 805dbe2..73481d9 100644 --- a/.travis.yml +++ b/.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 diff --git a/build.sh b/build.sh index 4283f1b..868c87d 100755 --- a/build.sh +++ b/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 diff --git a/create_dmg.sh b/create_dmg.sh index 6ba16f4..c100ebf 100755 --- a/create_dmg.sh +++ b/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 diff --git a/create_zip.sh b/create_zip.sh index a207531..98eb22b 100755 --- a/create_zip.sh +++ b/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 diff --git a/get_repo.sh b/get_repo.sh index d859e01..a97d382 100755 --- a/get_repo.sh +++ b/get_repo.sh @@ -1,5 +1,7 @@ #!/bin/bash +set -ex + if [ -d vscode ]; then cd vscode git fetch --all