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

As requested by the xamarin-macios team.
mono · Nov 4, 2019 · 062f0ab · 062f0ab
1 parent e1ef774
commit 062f0ab
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 24 deletions.
diff --git a/scripts/ci/pipeline/sdks-archive.groovy b/scripts/ci/pipeline/sdks-archive.groovy
@@ -50,31 +50,17 @@ parallel (
             }
         }
     },
-    "iOS (Xcode 11.1)": {
+    "iOS (Xcode 11.2)": {
         throttle(['provisions-ios-toolchain']) {
-            node ("xcode111") {
-                archive ("ios", "release", "Darwin", "", "", "", "xcode111")
+            node ("xcode112") {
+                archive ("ios", "release", "Darwin", "", "", "", "xcode112")
             }
         }
     },
-    "Mac (Xcode 11.1)": {
+    "Mac (Xcode 11.2)": {
         throttle(['provisions-mac-toolchain']) {
-            node ("xcode111") {
-                archive ("mac", "release", "Darwin", "", "", "", "xcode111")
-            }
-        }
-    },
-    "iOS (Xcode 11.2 beta2)": {
-        throttle(['provisions-ios-toolchain']) {
-            node ("xcode112b2") {
-                archive ("ios", "release", "Darwin", "", "", "", "xcode112b2")
-            }
-        }
-    },
-    "Mac (Xcode 11.2 beta2)": {
-        throttle(['provisions-mac-toolchain']) {
-            node ("xcode112b2") {
-                archive ("mac", "release", "Darwin", "", "", "", "xcode112b2")
+            node ("xcode112") {
+                archive ("mac", "release", "Darwin", "", "", "", "xcode112")
             }
         }
     },

diff --git a/scripts/ci/run-jenkins.sh b/scripts/ci/run-jenkins.sh
@@ -170,8 +170,8 @@ fi
 if [[ ${CI_TAGS} == *'sdks-ios'* ]];
    then
         # configuration on our bots
-        if [[ ${CI_TAGS} == *'xcode112b2'* ]]; then
-            export XCODE_DIR=/Applications/Xcode112b2.app/Contents/Developer
+        if [[ ${CI_TAGS} == *'xcode112'* ]]; then
+            export XCODE_DIR=/Applications/Xcode112.app/Contents/Developer
             export MACOS_VERSION=10.15
             export IOS_VERSION=13.2
             export TVOS_VERSION=13.2
@@ -240,8 +240,8 @@ fi
 if [[ ${CI_TAGS} == *'sdks-mac'* ]];
 then
     # configuration on our bots
-    if [[ ${CI_TAGS} == *'xcode112b2'* ]]; then
-        export XCODE_DIR=/Applications/Xcode112b2.app/Contents/Developer
+    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