diff options
author | Rodrigo Kumpera <kumpera@users.noreply.github.com> | 2018-10-25 01:20:35 +0300 |
---|---|---|
committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2018-10-25 01:20:35 +0300 |
commit | 3039d6f3f0489ec4ee390fbf0670608902fc5660 (patch) | |
tree | 0652bf195e08f851dc32b8368b61eb8982e267f7 | |
parent | cd47933265e1c28ac5e8fc241ec2bd4b05e995b5 (diff) |
[wasm] Improve build reliability. (#11349)
* [wasm] Fix wasm toolchain bootstraping
* [wasm] Move the provision step to happen before the build.
-rwxr-xr-x | scripts/ci/run-jenkins.sh | 1 | ||||
-rw-r--r-- | sdks/builds/wasm.mk | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/scripts/ci/run-jenkins.sh b/scripts/ci/run-jenkins.sh index 22e0bf67b06..94c0bac32ed 100755 --- a/scripts/ci/run-jenkins.sh +++ b/scripts/ci/run-jenkins.sh @@ -193,6 +193,7 @@ if [[ ${CI_TAGS} == *'webassembly'* ]] || [[ ${CI_TAGS} == *'wasm'* ]]; export aot_test_suites="System.Core" + ${TESTCMD} --label=provision --timeout=20m --fatal make --output-sync=recurse --trace -C sdks/builds provision-wasm ${TESTCMD} --label=archive --timeout=180m --fatal make -j ${CI_CPU_COUNT} --output-sync=recurse --trace -C sdks/builds archive-wasm NINJA= if [[ ${CI_TAGS} != *'no-tests'* ]]; then diff --git a/sdks/builds/wasm.mk b/sdks/builds/wasm.mk index 9a58ce167c1..0d3794bd98d 100644 --- a/sdks/builds/wasm.mk +++ b/sdks/builds/wasm.mk @@ -14,7 +14,7 @@ $(TOP)/sdks/builds/toolchains/emsdk: #This is a weird rule to workaround the circularity of the next rule. #.stamp-wasm-install-and-select-$(EMSCRIPTEN_VERSION) depends on .emscripten and, at the same time, it updates it. #This is designed to force the .stamp target to rerun when a different emscripten version is selected, which causes .emscripten to be updated -$(EMSCRIPTEN_SDK_DIR)/.emscripten: +$(EMSCRIPTEN_SDK_DIR)/.emscripten: | $(EMSCRIPTEN_SDK_DIR) touch $@ .stamp-wasm-install-and-select-$(EMSCRIPTEN_VERSION): .stamp-wasm-checkout-and-update-emsdk $(EMSCRIPTEN_SDK_DIR)/.emscripten |