Skip to content

Commit

Permalink
Merge pull request #72 from sudara/macos-14
Browse files Browse the repository at this point in the history
Update to M1 runners for macOS
  • Loading branch information
sudara authored Feb 5, 2024
2 parents 368718f + 5bda745 commit 72b53bf
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions .github/workflows/cmake_ctest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
os: ubuntu-22.04
pluginval-binary: ./pluginval
- name: macOS
os: macos-12
os: macos-14
pluginval-binary: pluginval.app/Contents/MacOS/pluginval
- name: Windows
os: windows-latest
Expand All @@ -52,7 +52,7 @@ jobs:
sudo apt-get update && sudo apt install libasound2-dev libx11-dev libxinerama-dev libxext-dev libfreetype6-dev libwebkit2gtk-4.0-dev libglu1-mesa-dev xvfb ninja-build
# downgrade gcc to workaround 22.04 and C++20 issue
# see: https://github.com/actions/runner-images/issues/8659
sudo apt-get install -y --allow-downgrades libc6=2.35-0ubuntu3.5 libc6-dev=2.35-0ubuntu3.5 libstdc++6=12.3.0-1ubuntu1~22.04 libgcc-s1=12.3.0-1ubuntu1~22.04
sudo apt-get install -y --allow-downgrades libc6=2.35-0ubuntu3.6 libc6-dev=2.35-0ubuntu3.6 libstdc++6=12.3.0-1ubuntu1~22.04 libgcc-s1=12.3.0-1ubuntu1~22.04
sudo /usr/bin/Xvfb $DISPLAY &
- name: Cache IPP (Windows)
Expand Down Expand Up @@ -87,6 +87,13 @@ jobs:
if: ${{ matrix.name == 'macOS' }}
run: brew install ninja osxutils

# This block can be removed once 15.1 is default (JUCE requires it when building on macOS 14)
- name: Use latest Xcode on system (macOS)
if: ${{ matrix.name == 'macOS' }}
uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: latest-stable

- name: Checkout code
uses: actions/checkout@v3
with:
Expand Down Expand Up @@ -213,7 +220,7 @@ jobs:
name: ${{ env.ARTIFACT_NAME }}.zip
path: '${{ env.ARTIFACTS_PATH }}/${{ env.ARTIFACT_NAME }}.zip'

- name: Upload DMG (MacOS)
- name: Upload DMG (macOS)
if: ${{ matrix.name == 'macOS' }}
uses: actions/upload-artifact@v3
with:
Expand Down

0 comments on commit 72b53bf

Please sign in to comment.