[sdks] Use Xcode 11.3 stable version for iOS/Mac SDKs

As requested by the xamarin-macios team. (cherry picked from commit 7e65a73)
mono · Dec 18, 2019 · fd9f379 · fd9f379
1 parent e3084ec
commit fd9f379
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 20 deletions.
diff --git 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
@@ -170,20 +170,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
@@ -240,11 +233,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