about summary refs log tree commit diff
path: root/.github/workflows/ci.yml
diff options
context:
space:
mode:
authorBlackHoleFox <blackholefoxdev@gmail.com>2022-11-19 14:18:09 -0600
committerBlackHoleFox <blackholefoxdev@gmail.com>2022-11-19 14:19:00 -0600
commitc46987b7dd22b8cebcda816239a2eaa5dcc1b52f (patch)
treefd668e8959f7025ee1f0713632b75dea006ebd0b /.github/workflows/ci.yml
parent2a434286a96d61e9f55a3144004beec48206bb29 (diff)
downloadrust-c46987b7dd22b8cebcda816239a2eaa5dcc1b52f.tar.gz
rust-c46987b7dd22b8cebcda816239a2eaa5dcc1b52f.zip
Bring back XCode selection CI script
This reverts commit 8514b0097b28f84ee5cfead059a5771c6a693fb0.
Diffstat (limited to '.github/workflows/ci.yml')
-rw-r--r--.github/workflows/ci.yml10
1 files changed, 10 insertions, 0 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 771cef6e4d0..af7cc4c63ca 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -96,6 +96,9 @@ jobs:
       - name: install sccache
         run: src/ci/scripts/install-sccache.sh
         if: success() && !env.SKIP_JOB
+      - name: select Xcode
+        run: src/ci/scripts/select-xcode.sh
+        if: success() && !env.SKIP_JOB
       - name: install clang
         run: src/ci/scripts/install-clang.sh
         if: success() && !env.SKIP_JOB
@@ -353,6 +356,7 @@ jobs:
               SCRIPT: "./x.py dist bootstrap --include-default-paths --stage 2"
               RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --host=aarch64-apple-darwin --target=aarch64-apple-darwin --enable-full-tools --enable-sanitizers --enable-profiler --disable-docs --set rust.jemalloc --set llvm.ninja=false"
               RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
+              SELECT_XCODE: /Applications/Xcode_12.2.app
               USE_XCODE_CLANG: 1
               MACOSX_DEPLOYMENT_TARGET: 11.0
               MACOSX_STD_DEPLOYMENT_TARGET: 11.0
@@ -503,6 +507,9 @@ jobs:
       - name: install sccache
         run: src/ci/scripts/install-sccache.sh
         if: success() && !env.SKIP_JOB
+      - name: select Xcode
+        run: src/ci/scripts/select-xcode.sh
+        if: success() && !env.SKIP_JOB
       - name: install clang
         run: src/ci/scripts/install-clang.sh
         if: success() && !env.SKIP_JOB
@@ -615,6 +622,9 @@ jobs:
       - name: install sccache
         run: src/ci/scripts/install-sccache.sh
         if: success() && !env.SKIP_JOB
+      - name: select Xcode
+        run: src/ci/scripts/select-xcode.sh
+        if: success() && !env.SKIP_JOB
       - name: install clang
         run: src/ci/scripts/install-clang.sh
         if: success() && !env.SKIP_JOB