From 8514b0097b28f84ee5cfead059a5771c6a693fb0 Mon Sep 17 00:00:00 2001
From: Hans Kratz <hans@appfour.com>
Date: Wed, 13 Oct 2021 17:44:39 +0200
Subject: Selecting the Xcode version no longer needed with the macos-11
 runners.

---
 src/ci/github-actions/ci.yml   |  5 -----
 src/ci/scripts/select-xcode.sh | 13 -------------
 2 files changed, 18 deletions(-)
 delete mode 100755 src/ci/scripts/select-xcode.sh

(limited to 'src')

diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index c9f8692d418..eb16cf3c762 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -153,10 +153,6 @@ x--expand-yaml-anchors--remove:
         run: src/ci/scripts/install-sccache.sh
         <<: *step
 
-      - name: select Xcode
-        run: src/ci/scripts/select-xcode.sh
-        <<: *step
-
       - name: install clang
         run: src/ci/scripts/install-clang.sh
         <<: *step
@@ -498,7 +494,6 @@ jobs:
                 --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
diff --git a/src/ci/scripts/select-xcode.sh b/src/ci/scripts/select-xcode.sh
deleted file mode 100755
index 3b9c77d42ba..00000000000
--- a/src/ci/scripts/select-xcode.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-# This script selects the Xcode instance to use.
-
-set -euo pipefail
-IFS=$'\n\t'
-
-source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
-
-if isMacOS; then
-    if [[ -s "${SELECT_XCODE-}" ]]; then
-        sudo xcode-select -s "${SELECT_XCODE}"
-    fi
-fi
-- 
cgit 1.4.1-3-g733a5