From 5dd48c6f7ade14b3d4dc1ebf0ed76178d7379136 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Alexander=20K=C3=B6plinger?= <alex.koeplinger@outlook.com>
Date: Tue, 10 Nov 2020 12:03:51 +0100
Subject: [PATCH] Add Mac Catalyst to CI

---
 scripts/ci/pipeline/sdks-archive.groovy |  7 +++++++
 scripts/ci/run-jenkins.sh               | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/scripts/ci/pipeline/sdks-archive.groovy b/scripts/ci/pipeline/sdks-archive.groovy
index 7567e22ef3d..974619976cc 100644
--- a/scripts/ci/pipeline/sdks-archive.groovy
+++ b/scripts/ci/pipeline/sdks-archive.groovy
@@ -64,6 +64,13 @@ parallel (
             }
         }
     },
+    "Mac Catalyst (Xcode 11.3)": {
+        throttle(['provisions-mac-toolchain']) {
+            node ("xcode113") {
+                archive ("catalyst", "release", "Darwin", "", "", "", "xcode113")
+            }
+        }
+    },
     "WASM Linux": {
         if (monoBranch != 'master') {
             echo "Skipping WASM build on non-master branch."
diff --git a/scripts/ci/run-jenkins.sh b/scripts/ci/run-jenkins.sh
index 1ed6950b937..1dae28223d8 100755
--- a/scripts/ci/run-jenkins.sh
+++ b/scripts/ci/run-jenkins.sh
@@ -268,6 +268,38 @@ then
     exit 0
 fi
 
+if [[ ${CI_TAGS} == *'sdks-catalyst'* ]];
+then
+    # configuration on our bots
+    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
+        export MACOS_VERSION=10.14
+    fi
+
+    # retrieve selected Xcode version
+    /usr/libexec/PlistBuddy -c 'Print :ProductBuildVersion' ${XCODE_DIR}/../version.plist > xcode_version.txt
+
+    # make sure we embed the correct path into the PDBs
+    export MONOTOUCH_MCS_FLAGS=-pathmap:${MONO_REPO_ROOT}/=/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/src/Xamarin.iOS/
+
+    echo "ENABLE_MACCAT=1" > sdks/Make.config
+    if [[ ${CI_TAGS} == *'cxx'* ]]; then
+        echo "ENABLE_CXX=1" >> sdks/Make.config
+    fi
+    if [[ ${CI_TAGS} == *'debug'* ]]; then
+        echo "CONFIGURATION=debug" >> sdks/Make.config
+    fi
+
+    ${TESTCMD} --label=configure --timeout=180m --fatal $gnumake -j ${CI_CPU_COUNT} --output-sync=recurse --trace -C sdks/builds configure-maccat NINJA=
+    ${TESTCMD} --label=build     --timeout=180m --fatal $gnumake -j ${CI_CPU_COUNT} --output-sync=recurse --trace -C sdks/builds build-maccat     NINJA=
+    ${TESTCMD} --label=archive   --timeout=180m --fatal $gnumake -j ${CI_CPU_COUNT} --output-sync=recurse --trace -C sdks/builds archive-maccat   NINJA=
+
+    exit 0
+fi
+
 if [[ ${CI_TAGS} == *'sdks-android'* ]];
    then
         echo "ENABLE_ANDROID=1" > sdks/Make.config
-- 
2.11.4.GIT