Skip to content

Update macOS naming to use CPU architecture; replace runner that will stop working in two weeks #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ixfd64 merged 3 commits into from
Nov 22, 2025
Merged

Update macOS naming to use CPU architecture; replace runner that will stop working in two weeks #53

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a8d0878
Update macOS naming to use RUNNER_ARCH variable
Artoria2e5 Nov 22, 2025
c888a51
Define our own arch; update runner
Artoria2e5 Nov 22, 2025
6ae96f8
swap runner order, clarify comments
ixfd64 Nov 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,13 +154,18 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macos-13, macos-14]
os: [macos-14, macos-15-intel]
fail-fast: false
env:
CC: clang
CPP: clang++
# needed for Homebrew 4.6.4 and above
HOMEBREW_DEVELOPER: '1'
# Used by CI workflow file. For mapping from "runs-on" / "os" to architecture, see:
# https://docs.github.com/en/actions/how-tos/write-workflows/choose-where-workflows-run/choose-the-runner-for-a-job#standard-github-hosted-runners-for-public-repositories
SELFARCH: ${{ matrix.os == 'macos-15-intel' && 'X64' || 'ARM64' }}
# Just because we use a new builder doesn't mean we don't want the build to run on an older OS
MACOSX_DEPLOYMENT_TARGET: 11.0.0
steps:
- uses: actions/checkout@v4

Expand Down Expand Up @@ -196,7 +201,7 @@ jobs:
- name: Upload build artifacts
uses: actions/upload-artifact@v4
with:
name: mfakto-${{ matrix.os }}
name: mfakto-macos-${{ env.SELFARCH }}
path: |
*.cl
Changelog-mfakto.txt
Expand All @@ -212,11 +217,11 @@ jobs:
- name: Create artifacts and release assets
if: startsWith(github.ref, 'refs/tags/')
run: |
tar cvjf mfakto-${{ matrix.os }}.tar.bz2 *.cl Changelog-mfakto.txt COPYING datatypes.h mfakto mfakto.ini README-SpecialVersions.txt README.txt tf_debug.h todo.txt
tar cvjf mfakto-macos-${{ env.SELFARCH }}.tar.bz2 *.cl Changelog-mfakto.txt COPYING datatypes.h mfakto mfakto.ini README-SpecialVersions.txt README.txt tf_debug.h todo.txt

- name: Release
uses: softprops/action-gh-release@v2
if: startsWith(github.ref, 'refs/tags/')
with:
files: |
mfakto-${{ matrix.os }}.tar.bz2
mfakto-macos-${{ env.SELFARCH }}.tar.bz2
Loading