From bbb8531ac60288a2559686ef080fa6ba6d1cd6cb Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Fri, 14 Feb 2020 14:19:39 +0000 Subject: [PATCH 1/5] Avoid installing deprecated Python 2 from Homebrew --- utils/webassembly/ci-mac.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/utils/webassembly/ci-mac.sh b/utils/webassembly/ci-mac.sh index c9caa6b29787e..e2d291c30a288 100755 --- a/utils/webassembly/ci-mac.sh +++ b/utils/webassembly/ci-mac.sh @@ -2,10 +2,7 @@ set -ex -brew install cmake ninja llvm python@2 - -# Install six for python3 migration -pip2 install six +brew install cmake ninja llvm SOURCE_PATH="$( cd "$(dirname $0)/../../.." && pwd )" SWIFT_PATH=$SOURCE_PATH/swift From a799444138e9ce4f79d57b7a546880a6e3ed6c65 Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Fri, 14 Feb 2020 14:48:08 +0000 Subject: [PATCH 2/5] Try to uninstall python@2 if installed --- utils/webassembly/ci-mac.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/webassembly/ci-mac.sh b/utils/webassembly/ci-mac.sh index e2d291c30a288..c59f8351a6e8e 100755 --- a/utils/webassembly/ci-mac.sh +++ b/utils/webassembly/ci-mac.sh @@ -2,6 +2,7 @@ set -ex +brew uninstall python@2 || true brew install cmake ninja llvm SOURCE_PATH="$( cd "$(dirname $0)/../../.." && pwd )" From 6b79918d09a27088d48050b5414c421461db7d31 Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Fri, 14 Feb 2020 22:31:36 +0000 Subject: [PATCH 3/5] Avoid invoking the build script twice --- utils/webassembly/ci-linux.sh | 1 - utils/webassembly/ci-mac.sh | 1 - 2 files changed, 2 deletions(-) diff --git a/utils/webassembly/ci-linux.sh b/utils/webassembly/ci-linux.sh index 0d194e43914f9..45b6bb42532d8 100755 --- a/utils/webassembly/ci-linux.sh +++ b/utils/webassembly/ci-linux.sh @@ -48,6 +48,5 @@ ln -s wasm32-wasi wasi-sdk/share/wasi-sysroot/lib/wasm32-wasi-unknown wget -O icu.tar.xz "https://github.com/swiftwasm/icu4c-wasi/releases/download/20190421.3/icu4c-wasi.tar.xz" tar xf icu.tar.xz -$BUILD_SCRIPT --release --debug-swift-stdlib --verbose # Run test but ignore failure temporarily $BUILD_SCRIPT --release --debug-swift-stdlib --verbose -t || true diff --git a/utils/webassembly/ci-mac.sh b/utils/webassembly/ci-mac.sh index c59f8351a6e8e..c60db6140d35b 100755 --- a/utils/webassembly/ci-mac.sh +++ b/utils/webassembly/ci-mac.sh @@ -39,6 +39,5 @@ ln -s wasm32-wasi wasi-sdk/share/wasi-sysroot/lib/wasm32-wasi-unknown wget -O icu.tar.xz "https://github.com/swiftwasm/icu4c-wasi/releases/download/20190421.3/icu4c-wasi.tar.xz" tar xf icu.tar.xz -$BUILD_SCRIPT --release --debug-swift-stdlib --verbose # Run test but ignore failure temporarily $BUILD_SCRIPT --release --debug-swift-stdlib --verbose -t || true From 086c829747997f9298a20824ada04e134acd61df Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Sun, 16 Feb 2020 17:08:50 +0000 Subject: [PATCH 4/5] Update ci-linux.sh --- utils/webassembly/ci-linux.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/webassembly/ci-linux.sh b/utils/webassembly/ci-linux.sh index 45b6bb42532d8..0d194e43914f9 100755 --- a/utils/webassembly/ci-linux.sh +++ b/utils/webassembly/ci-linux.sh @@ -48,5 +48,6 @@ ln -s wasm32-wasi wasi-sdk/share/wasi-sysroot/lib/wasm32-wasi-unknown wget -O icu.tar.xz "https://github.com/swiftwasm/icu4c-wasi/releases/download/20190421.3/icu4c-wasi.tar.xz" tar xf icu.tar.xz +$BUILD_SCRIPT --release --debug-swift-stdlib --verbose # Run test but ignore failure temporarily $BUILD_SCRIPT --release --debug-swift-stdlib --verbose -t || true From 31844a13a923065c7b0e50eae8124e3e8964eabd Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Sun, 16 Feb 2020 17:09:07 +0000 Subject: [PATCH 5/5] Update ci-mac.sh --- utils/webassembly/ci-mac.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/webassembly/ci-mac.sh b/utils/webassembly/ci-mac.sh index c60db6140d35b..c59f8351a6e8e 100755 --- a/utils/webassembly/ci-mac.sh +++ b/utils/webassembly/ci-mac.sh @@ -39,5 +39,6 @@ ln -s wasm32-wasi wasi-sdk/share/wasi-sysroot/lib/wasm32-wasi-unknown wget -O icu.tar.xz "https://github.com/swiftwasm/icu4c-wasi/releases/download/20190421.3/icu4c-wasi.tar.xz" tar xf icu.tar.xz +$BUILD_SCRIPT --release --debug-swift-stdlib --verbose # Run test but ignore failure temporarily $BUILD_SCRIPT --release --debug-swift-stdlib --verbose -t || true