From 77fcb7c7da410743583304593de491a9390aec09 Mon Sep 17 00:00:00 2001
From: Adam Getchell <acgetchell@ucdavis.edu>
Date: Fri, 24 Nov 2023 21:26:03 -0800
Subject: [PATCH] Update macOS and Travis CI configurations

- Try to fix macOS on GitHub Actions
- Try to install gcc-13 on Travis-CI
- AppVeyor nicely increased my timeout to 90 minutes, so remove Issue
---
 .github/workflows/macos.yml |  1 +
 .travis.yml                 | 18 ++++++++++--------
 README.md                   |  2 --
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 343686e6a..967accb60 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -20,6 +20,7 @@ jobs:
       run: |
         rm /usr/local/bin/2to3
         rm /usr/local/bin/2to3-3.11
+        rm /usr/local/bin/idle3
         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 891869f0a..6941c4aed 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,8 @@ cache:
 
 addons:
   apt:
+    sources:
+      - ubuntu-toolchain-r-test
     packages:
       - build-essential
       - automake
@@ -18,8 +20,8 @@ addons:
       - libtool-bin
       - texinfo
       - yasm
-      - gcc-12
-      - g++-12
+      - gcc-13
+      - g++-13
       - clang-15
       - ninja-build
       - cppcheck
@@ -33,7 +35,7 @@ os:
   - linux
 
 compiler:
-  - g++12
+  - g++13
   - clang-15
 
 jobs:
@@ -41,14 +43,14 @@ jobs:
   include:
     # CppCheck
     - os: linux
-      compiler: g++12
+      compiler: g++13
       env: CPPCHECK=true
       before_script:
         - export CMAKE_ARGS="-D ENABLE_CPPCHECK:BOOL=TRUE"
       after_success: skip
     # Valgrind
     - os: linux
-      compiler: g++12
+      compiler: g++13
       env: VALGRIND=true
       before_script:
         - export CMAKE_ARGS="-D ENABLE_IPO:BOOL=FALSE -D ENABLE_VALGRIND:BOOL=TRUE"
@@ -105,7 +107,7 @@ jobs:
         - ./initialize --s -n32000 -t11 -o
     # Doxygen
     - os: linux
-      compiler: g++12
+      compiler: g++13
       env: DOXYGEN=true
       install: skip
       script:
@@ -128,11 +130,11 @@ jobs:
           condition: $TRAVIS_BRANCH =~ ^(master|develop)$
   allow_failures:
     - os: linux
-      compiler: g++12
+      compiler: g++13
       env: DOXYGEN=true
 
 before_install:
-  - if [[ "$CXX" == "g++" ]]; then export CXX="g++-12" CC="gcc-12"; fi
+  - if [[ "$CXX" == "g++" ]]; then export CXX="g++-13" CC="gcc-13"; fi
   - if [[ "$CXX" == "clang++" ]]; then export CXX="clang++-15" CC="clang-15"; fi
 
 install:
diff --git a/README.md b/README.md
index b308f5deb..5eab774ef 100644
--- a/README.md
+++ b/README.md
@@ -404,8 +404,6 @@ Optional:
 
 ## Issues
 
-The [AppVeyor] tests to build on Windows will fail if it takes longer than 60 minutes to build. This is fixed with a paid subscription, but this project is open source.
-
 [vcpkg]'s version of [date] has an unfixed bug [#23637] which produces `use-of-uninitialized-value` in [MemorySanitizer].
 
 [docopt] also has a `use-of-uninitialized-value` bug ([#149]).