Merge pull request #2513 from quentin/macos12-deprecation

chore: bump macos versions used in CI
souffle-lang · Oct 22, 2024 · 73edcf3 · 73edcf3
2 parents 437f280 + 30ec732
commit 73edcf3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 17 deletions.
diff --git a/.github/workflows/CI-Tests.yml b/.github/workflows/CI-Tests.yml
@@ -113,15 +113,9 @@ jobs:
       matrix:
         chunk: ${{ fromJSON(needs.Test-Setup.outputs.chunks) }}
 
-    runs-on: macos-12
+    runs-on: macos-13
 
     steps:
-    - name: Select XCode version
-      uses: maxim-lobanov/setup-xcode@v1
-      with:
-        # Pending https://github.com/actions/runner-images/issues/6350
-        xcode-version: '13.4'
-
     - name: checkout
       uses: actions/checkout@v4
 
@@ -146,14 +140,9 @@ jobs:
       matrix:
         chunk: ${{ fromJSON(needs.Test-Setup.outputs.chunks) }}
 
-    runs-on: macos-14
+    runs-on: macos-15
 
     steps:
-    - name: Select XCode version
-      uses: maxim-lobanov/setup-xcode@v1
-      with:
-        xcode-version: '15.2'
-
     - name: checkout
       uses: actions/checkout@v4
 

diff --git a/sh/setup/install_macos_deps.sh b/sh/setup/install_macos_deps.sh
@@ -9,13 +9,13 @@ set -x
 
 # Install requirements of MAC OS X
 brew install bison libtool mcpp libffi swig
-brew install gcc@10
-brew link gcc@10
+brew install gcc@12
+brew link gcc@12
 
 echo "/usr/local/opt/bison/bin:$PATH" >> $GITHUB_PATH
 echo 'PKG_CONFIG_PATH="/usr/local/opt/libffi/lib/pkgconfig/"' >> $GITHUB_ENV 
-echo 'CC=gcc-10' >> $GITHUB_ENV
-echo 'CXX=g++-10' >> $GITHUB_ENV
+echo 'CC=gcc-12' >> $GITHUB_ENV
+echo 'CXX=g++-12' >> $GITHUB_ENV
 
 set +e
 set +x