From 25742d2c9ade743ed908b89dbe818e9a877b88b5 Mon Sep 17 00:00:00 2001 From: Ted Turocy Date: Fri, 8 Nov 2024 10:49:07 +0000 Subject: [PATCH] Separate builds for MacOS 13 and 14, 14 uses the M1-based runner. --- .github/workflows/tools.yml | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tools.yml b/.github/workflows/tools.yml index 7bb5cf882..ffb5d3afb 100644 --- a/.github/workflows/tools.yml +++ b/.github/workflows/tools.yml @@ -40,8 +40,8 @@ jobs: make sudo make install - macos: - runs-on: macos-latest + macos-13: + runs-on: macos-13 if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name steps: - uses: actions/checkout@v4 @@ -56,7 +56,26 @@ jobs: - run: make osx-dmg - uses: actions/upload-artifact@v4 with: - name: artifact-osx + name: artifact-osx-13 + path: "*.dmg" + + macos-14: + runs-on: macos-14 + if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name + steps: + - uses: actions/checkout@v4 + - name: Install dependencies + run: brew install automake autoconf wxwidgets + - run: aclocal + - run: automake --add-missing + - run: autoconf + - run: ./configure + - run: make + - run: sudo make install + - run: make osx-dmg + - uses: actions/upload-artifact@v4 + with: + name: artifact-osx-14 path: "*.dmg" windows: