Skip to content

Commit

Permalink
chore: bump macos versions used in CI
Browse files Browse the repository at this point in the history
The macOS 12 runner image will be removed by December 3rd, 2024
See actions/runner-images#10721
  • Loading branch information
quentin committed Oct 18, 2024
1 parent e6cc668 commit 30ec732
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 17 deletions.
15 changes: 2 additions & 13 deletions .github/workflows/CI-Tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down
8 changes: 4 additions & 4 deletions sh/setup/install_macos_deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 30ec732

Please sign in to comment.