Skip to content

Commit 338ac93

Browse files
committed
try mac arm
1 parent a11e617 commit 338ac93

File tree

7 files changed

+29
-19
lines changed

7 files changed

+29
-19
lines changed

.github/workflows/build_nix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
fail-fast: false
2828
max-parallel: 4
2929
matrix:
30-
python-version: ['3.9', '3.10', '3.11'] # , '3.12' not ready
30+
python-version: ['3.10', '3.11', '3.12']
3131

3232
steps:
3333
- uses: actions/checkout@v3

.github/workflows/build_osx.yml

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,38 +20,47 @@ env:
2020
jobs:
2121
build:
2222
name: Python ${{ matrix.python-version }}
23-
runs-on: macos-latest
23+
runs-on: ${{ matrix.os }}
2424

2525
strategy:
2626
fail-fast: false
27-
max-parallel: 4
27+
max-parallel: 6
2828
matrix:
29+
os: [ macos-12, macos-13, macos-latest]
2930
python-version: ['3.11', '3.12']
3031

3132
steps:
32-
- uses: actions/checkout@v3
33+
- uses: actions/checkout@v4
3334
with:
3435
submodules: true
3536

3637
- uses: actions/setup-python@v4
3738
with:
3839
python-version: ${{ matrix.python-version }}
39-
architecture: x64
4040

4141
- name: info
4242
run: |
4343
python3 -V
4444
clang -v
45-
swig -version
45+
swig -version || ( brew update && brew install swig && swig -version )
4646
4747
- name: pip
4848
run: |
4949
python3 -m pip install wheel pip --upgrade
5050
python3 -m pip install -r requirements.txt
5151
52-
- name: build
52+
- name: build_arm
53+
if: matrix.os == 'macos-latest'
5354
run: |
54-
curl -Lo mkn https://github.com/mkn/mkn/releases/download/latest/mkn_osx
55+
curl -Lo mkn https://github.com/mkn/mkn/releases/download/latest/mkn_arm_osx
56+
chmod +x mkn
57+
./mkn -C lib build -g 0 -dtOa "-fPIC -std=c++17"
58+
59+
60+
- name: build_x86
61+
if: matrix.os != 'macos-latest'
62+
run: |
63+
curl -Lo mkn https://github.com/mkn/mkn/releases/download/latest/mkn_x86_osx
5564
chmod +x mkn
5665
./mkn -C lib build -g 0 -dtOa "-fPIC -std=c++17"
5766

.github/workflows/build_win.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
fail-fast: false
2727
max-parallel: 4
2828
matrix:
29-
python-version: ['3.9', '3.10', '3.11', '3.12']
29+
python-version: ['3.10', '3.11', '3.12']
3030

3131
steps:
3232
- uses: actions/checkout@v3

.github/workflows/merge_master.yaml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ env:
2020
jobs:
2121

2222
build_linux:
23-
runs-on: ubuntu-latest
24-
container: quay.io/pypa/manylinux2014_x86_64
23+
runs-on: ubuntu-20.04
24+
container: quay.io/pypa/manylinux_2_28_x86_64:latest
2525

2626
strategy:
2727
fail-fast: false
@@ -65,7 +65,7 @@ jobs:
6565
max-parallel: 4
6666
matrix:
6767
os: [windows-latest]
68-
python-version: ['3.9', '3.10', '3.11', '3.12']
68+
python-version: ['3.10', '3.11', '3.12']
6969

7070
runs-on: ${{ matrix.os }}
7171

@@ -86,7 +86,7 @@ jobs:
8686
git config --global --add safe.directory '*'
8787
python3 -V
8888
python3 -m pip install -U pip
89-
python3 -m pip install -U build twine wheel
89+
python3 -m pip install -U build twine wheel setuptools
9090
python3 -m pip install -U -r requirements.txt
9191
9292
- name: build windows
@@ -119,7 +119,7 @@ jobs:
119119
runs-on: ${{ matrix.os }}
120120

121121
steps:
122-
- uses: actions/checkout@v3
122+
- uses: actions/checkout@v4
123123
with:
124124
submodules: true
125125
- uses: actions/setup-python@v4
@@ -134,12 +134,13 @@ jobs:
134134
python3 -m pip install -U pip
135135
python3 -m pip install -U build twine wheel
136136
python3 -m pip install -U -r requirements.txt
137+
swig -version || ( brew update && brew install swig && swig -version )
137138
138139
- name: build macos
139140
env:
140141
MKN_PYTHON_LIB_EMBED: 1
141142
run: |
142-
curl -Lo mkn https://github.com/mkn/mkn/releases/download/latest/mkn_osx
143+
curl -Lo mkn https://github.com/mkn/mkn/releases/download/latest/mkn_arm_osx
143144
chmod +x mkn
144145
PATH=$PWD:$PATH mkn -C lib build -g 0 -dtO 2 -a "-fPIC -std=c++17"
145146
@@ -188,7 +189,7 @@ jobs:
188189
strategy:
189190
matrix:
190191
os: [windows-latest, ubuntu-latest]
191-
python-version: ['3.9', '3.10', '3.11', '3.12']
192+
python-version: ['3.10', '3.11', '3.12']
192193
runs-on: ${{ matrix.os }}
193194
steps:
194195
- name: Setup Python

.github/workflows/pythonpublish-osx.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
max-parallel: 4
1616
matrix:
17-
python-version: ['3.9', '3.10', '3.11', '3.12']
17+
python-version: ['3.10', '3.11', '3.12']
1818
name: Python ${{ matrix.python-version }}
1919
steps:
2020
- uses: actions/checkout@v3

.github/workflows/pythonpublish-win.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
max-parallel: 4
1616
matrix:
17-
python-version: ['3.9', '3.10', '3.11', '3.12']
17+
python-version: ['3.10', '3.11', '3.12']
1818
name: Python ${{ matrix.python-version }}
1919
steps:
2020
- uses: actions/checkout@v3

lib/mkn.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ profile:
3636
bsd_lib: ${bsd_largs}
3737
win: -LTCG
3838
mod: |
39-
lang.python3{compile{with: numpy}, link{delete: CoreFoundation }}
39+
lang.python3{compile:{with: numpy}, link:{delete: CoreFoundation }}
4040
4141
- name: tick.py
4242
parent: arg

0 commit comments

Comments
 (0)