diff options
author | Ludovic Henry <luhenry@microsoft.com> | 2018-10-08 18:46:52 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-08 18:46:52 +0300 |
commit | 58228c24faf3d10a1d6f426bc03f045c2abb55c4 (patch) | |
tree | ac2db8c0fa4855e5141135e57a1a315ecd5dd6bc /scripts/ci | |
parent | c7c89f2155f80a9bb3f04e5e14df06066ba5f04e (diff) |
[sdks] Build Android SDKs archive in Debug configuration on master builds (#11007)
* [sdks] Build Android SDKs archive in Debug configuration on master builds
* [sdks] Drop `product-` prefix from Android and iOS SDKs CI_TAGS parameters
Diffstat (limited to 'scripts/ci')
-rwxr-xr-x | scripts/ci/run-jenkins.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/ci/run-jenkins.sh b/scripts/ci/run-jenkins.sh index d954f253b9b..a27594e5467 100755 --- a/scripts/ci/run-jenkins.sh +++ b/scripts/ci/run-jenkins.sh @@ -102,7 +102,7 @@ if [[ ${CI_TAGS} == *'sdks-llvm'* ]]; then exit 0 fi -if [[ ${CI_TAGS} == *'product-sdks-ios'* ]]; +if [[ ${CI_TAGS} == *'sdks-ios'* ]]; then echo "DISABLE_ANDROID=1" > sdks/Make.config echo "DISABLE_WASM=1" >> sdks/Make.config @@ -135,7 +135,7 @@ if [[ ${CI_TAGS} == *'product-sdks-ios'* ]]; exit 0 fi -if [[ ${CI_TAGS} == *'product-sdks-android'* ]]; +if [[ ${CI_TAGS} == *'sdks-android'* ]]; then echo "DISABLE_IOS=1" > sdks/Make.config echo "DISABLE_WASM=1" >> sdks/Make.config @@ -150,6 +150,9 @@ if [[ ${CI_TAGS} == *'product-sdks-android'* ]]; ${TESTCMD} --label=provision-android --timeout=120m --fatal make -j ${CI_CPU_COUNT} -C sdks/builds provision-android && make -C sdks/android accept-android-license ${TESTCMD} --label=provision-mxe --timeout=240m --fatal make -j ${CI_CPU_COUNT} -C sdks/builds provision-mxe ${TESTCMD} --label=archive --timeout=180m --fatal make -j ${CI_CPU_COUNT} --output-sync=recurse --trace -C sdks/builds archive-android NINJA= IGNORE_PROVISION_ANDROID=1 IGNORE_PROVISION_MXE=1 + if [[ ${CI_TAGS} != *'pull-request'* ]]; then + ${TESTCMD} --label=archive-debug --timeout=180m --fatal make -j ${CI_CPU_COUNT} --output-sync=recurse --trace -C sdks/builds archive-android NINJA= IGNORE_PROVISION_ANDROID=1 IGNORE_PROVISION_MXE=1 CONFIGURATION=debug + fi ${TESTCMD} --label=mini --timeout=60m make -C sdks/android check-mini ${TESTCMD} --label=corlib --timeout=60m make -C sdks/android check-corlib |