Skip to content

Commit

Permalink
try mac arm
Browse files Browse the repository at this point in the history
  • Loading branch information
PhilipDeegan committed Aug 13, 2024
1 parent a11e617 commit cfcee35
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
python-version: ['3.9', '3.10', '3.11'] # , '3.12' not ready
python-version: ['3.10', '3.11', '3.12']

steps:
- uses: actions/checkout@v3
Expand Down
18 changes: 14 additions & 4 deletions .github/workflows/build_osx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,17 @@ env:
jobs:
build:
name: Python ${{ matrix.python-version }}
runs-on: macos-latest
runs-on: ${{ matrix.os }}

strategy:
fail-fast: false
max-parallel: 4
matrix:
os: [ macos-12, macos-13, macos-latest]
python-version: ['3.11', '3.12']

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

Expand All @@ -49,9 +50,18 @@ jobs:
python3 -m pip install wheel pip --upgrade
python3 -m pip install -r requirements.txt
- name: build
- name: build_arm
if: runner.os == 'macos-latest'
run: |
curl -Lo mkn https://github.com/mkn/mkn/releases/download/latest/mkn_osx
curl -Lo mkn https://github.com/mkn/mkn/releases/download/latest/mkn_arm_osx
chmod +x mkn
./mkn -C lib build -g 0 -dtOa "-fPIC -std=c++17"
- name: build_x86
if: runner.os != 'macos-latest'
run: |
curl -Lo mkn https://github.com/mkn/mkn/releases/download/latest/mkn_x86_osx
chmod +x mkn
./mkn -C lib build -g 0 -dtOa "-fPIC -std=c++17"
Expand Down
2 changes: 1 addition & 1 deletion lib/mkn.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ profile:
bsd_lib: ${bsd_largs}
win: -LTCG
mod: |
lang.python3{compile{with: numpy}, link{delete: CoreFoundation }}
lang.python3{compile:{with: numpy}, link:{delete: CoreFoundation }}
- name: tick.py
parent: arg
Expand Down

0 comments on commit cfcee35

Please sign in to comment.