diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2019-12-13 19:26:59 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2019-12-13 19:27:24 +0300 |
| commit | 7e65a73d4da4180576d5b8d3efcf45235a385cd1 (patch) | |
| tree | 382fc7b1e7e7a9f48e803de9e7a2274db81168e5 /scripts/ci | |
| parent | 96fa4e8c6f7f166fa6adf3fa2f055ee0c2d66c31 (diff) | |
[sdks] Use Xcode 11.3 stable version for iOS/Mac SDKs
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 | 18 |
2 files changed, 10 insertions, 20 deletions
diff --git a/scripts/ci/pipeline/sdks-archive.groovy b/scripts/ci/pipeline/sdks-archive.groovy index 72bb5d31001..45294337906 100644 --- a/scripts/ci/pipeline/sdks-archive.groovy +++ b/scripts/ci/pipeline/sdks-archive.groovy @@ -50,17 +50,17 @@ parallel ( } } }, - "iOS (Xcode 11.2)": { + "iOS (Xcode 11.3)": { throttle(['provisions-ios-toolchain']) { - node ("xcode112") { - archive ("ios", "release", "Darwin", "", "", "", "xcode112") + node ("xcode113") { + archive ("ios", "release", "Darwin", "", "", "", "xcode113") } } }, - "Mac (Xcode 11.2)": { + "Mac (Xcode 11.3)": { throttle(['provisions-mac-toolchain']) { - node ("xcode112") { - archive ("mac", "release", "Darwin", "", "", "", "xcode112") + node ("xcode113") { + archive ("mac", "release", "Darwin", "", "", "", "xcode113") } } }, diff --git a/scripts/ci/run-jenkins.sh b/scripts/ci/run-jenkins.sh index f4206b39179..df8065e3163 100755 --- a/scripts/ci/run-jenkins.sh +++ b/scripts/ci/run-jenkins.sh @@ -175,20 +175,13 @@ fi if [[ ${CI_TAGS} == *'sdks-ios'* ]]; then # configuration on our bots - if [[ ${CI_TAGS} == *'xcode112'* ]]; then - export XCODE_DIR=/Applications/Xcode112.app/Contents/Developer + if [[ ${CI_TAGS} == *'xcode113'* ]]; then + export XCODE_DIR=/Applications/Xcode113.app/Contents/Developer export MACOS_VERSION=10.15 export IOS_VERSION=13.2 export TVOS_VERSION=13.2 export WATCHOS_VERSION=6.1 export WATCHOS64_32_VERSION=6.1 - elif [[ ${CI_TAGS} == *'xcode111'* ]]; then - export XCODE_DIR=/Applications/Xcode111.app/Contents/Developer - export MACOS_VERSION=10.15 - export IOS_VERSION=13.1 - 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 @@ -246,11 +239,8 @@ fi if [[ ${CI_TAGS} == *'sdks-mac'* ]]; then # configuration on our bots - if [[ ${CI_TAGS} == *'xcode112'* ]]; then - export XCODE_DIR=/Applications/Xcode112.app/Contents/Developer - export MACOS_VERSION=10.15 - elif [[ ${CI_TAGS} == *'xcode111'* ]]; then - export XCODE_DIR=/Applications/Xcode111.app/Contents/Developer + if [[ ${CI_TAGS} == *'xcode113'* ]]; then + export XCODE_DIR=/Applications/Xcode113.app/Contents/Developer export MACOS_VERSION=10.15 else export XCODE_DIR=/Applications/Xcode101.app/Contents/Developer |