From 313a6e92740c9588c612ddc03115eab1d4d68ac9 Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Tue, 16 Feb 2021 11:36:08 -0800
Subject: [PATCH] CI: Don't run xcode-select.

Changing the developer directory shouldn't be necessary after the include
path fixups in 270c8ed746.
---
 .github/workflows/macos.yml | 4 ----
 .travis.yml                 | 2 --
 2 files changed, 6 deletions(-)

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index e15f29f3cc..2808e0a6f2 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -29,10 +29,6 @@ jobs:
         run: gem install asciidoctor
       - name: Mkdir
         run: mkdir build
-      - name: Select xcode
-        run: |
-          sudo xcode-select --switch /Library/Developer/CommandLineTools
-          xcode-select --print-path
       - name: Cmake
         working-directory: build
         run: cmake -GNinja ..
diff --git a/.travis.yml b/.travis.yml
index 3a6a12ddd4..fbcfa9c35d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -65,8 +65,6 @@ before_install:
   - if [ "$TRAVIS_OS_NAME" == "osx" ]; then ./tools/macos-setup-brew.sh; fi
   - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install softhsm; fi
   - if [ "$TRAVIS_OS_NAME" == "osx" ]; then sed s/access_bpf/staff/ packaging/macosx/ChmodBPF/ChmodBPF | sudo bash; fi
-  # Required to fix an issue on macOS 10.14. Remove it as soon as Travis moves to 10.15.
-  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then sudo xcode-select --switch /Library/Developer/CommandLineTools; fi
   # linux
   - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo ./tools/debian-setup.sh --install-optional --install-test-deps -q; fi
   - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -y python3-pip; fi