Skip to content

Commit 60af097

Browse files
Simplify macos build pipeline
1 parent 787fb44 commit 60af097

File tree

1 file changed

+13
-40
lines changed

1 file changed

+13
-40
lines changed

.github/workflows/ci.yml

+13-40
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,16 @@ jobs:
6363
with:
6464
name: iaito-amd64.deb
6565
path: dist/debian/*/*.deb
66-
acr-macos-x64:
67-
runs-on: macos-13
66+
acr-macos:
67+
strategy:
68+
fail-fast: false
69+
matrix:
70+
include:
71+
- arch: arm64
72+
macos: latest
73+
- arch: x64
74+
macos: 13
75+
runs-on: macos-${{ matrix.macos }}
6876
steps:
6977
- uses: actions/checkout@v4
7078
with:
@@ -88,44 +96,10 @@ jobs:
8896
- name: build iaito
8997
run: |
9098
./configure
91-
make -j4 QMAKE_FLAGS=IAITO_BUNDLE_R2_APPBUNDLE=true
92-
- name: packaging
93-
run: make -C dist/macos
94-
- uses: actions/upload-artifact@v4
95-
with:
96-
name: iaito-x64.dmg
97-
path: dist/macos/iaito.dmg
98-
acr-macos-arm64:
99-
runs-on: macos-latest
100-
steps:
101-
- uses: actions/checkout@v4
102-
with:
103-
submodules: false # 'recursive' 'true' or 'false'
104-
persist-credentials: false
105-
- uses: actions/setup-python@v5
106-
with:
107-
python-version: 3.11.x
108-
- name: uname
109-
run: uname -a
110-
- name: install dependencies
111-
run: |
112-
brew install qt@5
113-
echo $(brew --prefix qt@5)/bin >> $GITHUB_PATH
114-
pip3 install meson ninja
115-
- name: install r2
116-
working-directory: dist/macos
117-
run: |
118-
curl -Lo radare2.pkg "https://github.com/radareorg/radare2/releases/download/${{env.R2V}}/radare2-m1-${{env.R2V}}.pkg"
119-
sudo installer -pkg radare2.pkg -target /
120-
- name: build iaito
121-
run: |
122-
./configure
123-
make -j4 QMAKE_FLAGS=IAITO_BUNDLE_R2_APPBUNDLE=true
124-
- name: packaging
125-
run: make -C dist/macos
99+
make -j4 -C dist/macos
126100
- uses: actions/upload-artifact@v4
127101
with:
128-
name: iaito-arm64.dmg
102+
name: iaito-${{ matrix.arch }}.dmg
129103
path: dist/macos/iaito.dmg
130104
meson:
131105
runs-on: ${{ matrix.os }}
@@ -222,8 +196,7 @@ jobs:
222196
tag_name: ${{ steps.release.outputs.tag }}
223197
needs:
224198
- acr-linux
225-
- acr-macos-arm64
226-
- acr-macos-x64
199+
- acr-macos
227200
- w64-meson
228201
runs-on: ubuntu-latest
229202
steps:

0 commit comments

Comments
 (0)