diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2019-10-14 19:38:06 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-14 19:38:06 +0300 |
| commit | 850def2f3bbc97f0701bb20dc75cf470d162745b (patch) | |
| tree | 58733aeaffba8c2ca75488f541130ce93728207c /scripts/ci | |
| parent | cae52aa4a6592cd4ca29e528fb4f05a10b04c078 (diff) | |
[ci] Use Xcode11.1 for XI/XM Mono SDK builds (#17313)
As requested by the xamarin-macios team.
Diffstat (limited to 'scripts/ci')
| -rw-r--r-- | scripts/ci/pipeline/sdks-archive.groovy | 12 | ||||
| -rwxr-xr-x | scripts/ci/run-jenkins.sh | 30 |
2 files changed, 24 insertions, 18 deletions
diff --git a/scripts/ci/pipeline/sdks-archive.groovy b/scripts/ci/pipeline/sdks-archive.groovy index e7f09802b86..e7e17068250 100644 --- a/scripts/ci/pipeline/sdks-archive.groovy +++ b/scripts/ci/pipeline/sdks-archive.groovy @@ -50,17 +50,17 @@ parallel ( } } }, - "iOS (Xcode 11)": { + "iOS (Xcode 11.1)": { throttle(['provisions-ios-toolchain']) { - node ("xcode11") { - archive ("ios", "release", "Darwin", "", "", "", "xcode11") + node ("xcode111") { + archive ("ios", "release", "Darwin", "", "", "", "xcode111") } } }, - "Mac (Xcode 11)": { + "Mac (Xcode 11.1)": { throttle(['provisions-mac-toolchain']) { - node ("xcode11") { - archive ("mac", "release", "Darwin", "", "", "", "xcode11") + node ("xcode111") { + archive ("mac", "release", "Darwin", "", "", "", "xcode111") } } }, diff --git a/scripts/ci/run-jenkins.sh b/scripts/ci/run-jenkins.sh index 8b3b7921eca..caca159c8d9 100755 --- a/scripts/ci/run-jenkins.sh +++ b/scripts/ci/run-jenkins.sh @@ -175,20 +175,23 @@ fi if [[ ${CI_TAGS} == *'sdks-ios'* ]]; then # configuration on our bots - if [[ ${CI_TAGS} == *'xcode11'* ]]; then - export XCODE_DIR=/Applications/Xcode11.app/Contents/Developer + if [[ ${CI_TAGS} == *'xcode112b2'* ]]; then + export XCODE_DIR=/Applications/Xcode112b2.app/Contents/Developer + export MACOS_VERSION=10.15 + export IOS_VERSION=13.0 + export TVOS_VERSION=13.0 + export WATCHOS_VERSION=6.0 + export WATCHOS64_32_VERSION=6.0 + if [[ ${CI_TAGS} == *'xcode111'* ]]; then + export XCODE_DIR=/Applications/Xcode111.app/Contents/Developer export MACOS_VERSION=10.15 export IOS_VERSION=13.0 export TVOS_VERSION=13.0 export WATCHOS_VERSION=6.0 export WATCHOS64_32_VERSION=6.0 else - export XCODE_DIR=/Applications/Xcode101.app/Contents/Developer - export MACOS_VERSION=10.14 - export IOS_VERSION=12.1 - export TVOS_VERSION=12.1 - export WATCHOS_VERSION=5.1 - export WATCHOS64_32_VERSION=5.1 + echo "Error: no Xcode selected in CI_TAGS env var." + exit 1 fi # retrieve selected Xcode version @@ -237,12 +240,15 @@ fi if [[ ${CI_TAGS} == *'sdks-mac'* ]]; then # configuration on our bots - if [[ ${CI_TAGS} == *'xcode11'* ]]; then - export XCODE_DIR=/Applications/Xcode11.app/Contents/Developer + if [[ ${CI_TAGS} == *'xcode112b2'* ]]; then + export XCODE_DIR=/Applications/Xcode112b2.app/Contents/Developer + export MACOS_VERSION=10.15 + if [[ ${CI_TAGS} == *'xcode111'* ]]; then + export XCODE_DIR=/Applications/Xcode111.app/Contents/Developer export MACOS_VERSION=10.15 else - export XCODE_DIR=/Applications/Xcode101.app/Contents/Developer - export MACOS_VERSION=10.14 + echo "Error: no Xcode selected in CI_TAGS env var." + exit 1 fi # retrieve selected Xcode version |