From 6cf22dc85c4247a8a070aa1aadec3fb07c4ca385 Mon Sep 17 00:00:00 2001
From: Adam Getchell <acgetchell@ucdavis.edu>
Date: Sat, 25 Nov 2023 16:58:14 -0800
Subject: [PATCH] Update macOS.yml and .travis.yml

- Remove idel3.11 from the list of removed files in macOS.yml
- Add update-alternatives commands to set g++-12 and clang++-16 as default compilers in .travis.yml
---
 .github/workflows/macos.yml |  1 +
 .travis.yml                 | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 967accb60..bdf637524 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -21,6 +21,7 @@ jobs:
         rm /usr/local/bin/2to3
         rm /usr/local/bin/2to3-3.11
         rm /usr/local/bin/idle3
+        rm /usr/local/bin/idel3.11
         brew install automake autoconf autoconf-archive libtool texinfo yasm ninja python ccache pkg-config
 
     - name: Restore artifacts or setup vcpkg
diff --git a/.travis.yml b/.travis.yml
index 86453bf0b..fa5010703 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -132,8 +132,18 @@ jobs:
       env: DOXYGEN=true
 
 before_install:
-  - if [[ "$CXX" == "g++" ]]; then export CXX="g++-12" CC="gcc-12"; fi
-  - if [[ "$CXX" == "clang++" ]]; then export CXX="clang++-16" CC="clang-16"; fi
+  - |
+    if [[ "$CXX" == "g++" ]]; then
+      sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-12 90
+      sudo update-alternatives --config gcc
+      export CXX="g++-12" CC="gcc-12"
+    fi
+  - |
+    if [[ "$CXX" == "clang++" ]]; then
+      sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-16 90
+      sudo update-alternatives --config clang
+      export CXX="clang++-16" CC="clang-16"
+    fi
 
 install:
   # vcpkg should be cached, but clone it if not