diff options
| author | monojenkins <jo.shields+jenkins@xamarin.com> | 2020-11-11 03:53:27 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-11 03:53:27 +0300 |
| commit | dfbfe5eed1992905b0dac80a8dc7d6f1f9647735 (patch) | |
| tree | cf9211e6c6014967b60b44acf4b706cd35ce2da8 /scripts/ci | |
| parent | ac596375c762c6b8dbe3c802f0ce626004eab51c (diff) | |
[2020-02] Build makefile to support Mac Catalyst (#20566)mono-6.12.0.110
Backport of #20537.
Co-authored-by: Frank A. Krueger <fak@praeclarum.org>
Co-authored-by: Alexander Köplinger <alex.koeplinger@outlook.com>
Diffstat (limited to 'scripts/ci')
| -rw-r--r-- | scripts/ci/pipeline/sdks-archive.groovy | 7 | ||||
| -rwxr-xr-x | scripts/ci/run-jenkins.sh | 33 |
2 files changed, 40 insertions, 0 deletions
diff --git a/scripts/ci/pipeline/sdks-archive.groovy b/scripts/ci/pipeline/sdks-archive.groovy index 7567e22ef3d..18ae6771ede 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 ("maccat", "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 25f48d4f5c5..2b26a290a51 100755 --- a/scripts/ci/run-jenkins.sh +++ b/scripts/ci/run-jenkins.sh @@ -236,6 +236,39 @@ if [[ ${CI_TAGS} == *'sdks-ios'* ]]; exit 0 fi + +if [[ ${CI_TAGS} == *'sdks-maccat'* ]]; +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-mac'* ]]; then # configuration on our bots |