@@ -157,23 +157,11 @@ jobs:
157
157
*.tar.xz
158
158
159
159
macos :
160
- strategy :
161
- matrix :
162
- debug : [0, 1]
163
- target : [universal-10.15]
164
160
runs-on : macos-12
165
161
steps :
166
162
- uses : actions/checkout@v4
167
163
with :
168
- submodules : recursive
169
- - name : Set debug or release
170
- shell : bash
171
- run : |
172
- if [ "${{ matrix.debug }}" -eq 1 ]; then
173
- echo "TARGET_SUFFIX=-debug" >> $GITHUB_ENV
174
- echo "MAKE_ARGS='DEBUG=true jack au'" >> $GITHUB_ENV
175
- echo "PAWPAW_DEBUG=1" >> $GITHUB_ENV
176
- fi
164
+ submodules : recursives
177
165
- name : Set up cache
178
166
id : cache
179
167
uses : actions/cache@v4
@@ -188,32 +176,32 @@ jobs:
188
176
src/Rack/dep/libarchive-3.4.3
189
177
src/Rack/dep/libsamplerate-0.1.9
190
178
src/Rack/dep/zstd-1.4.5
191
- key : macos-${{ matrix.target }}${{ env.TARGET_SUFFIX }} -v${{ env.CACHE_VERSION }}
179
+ key : macos-universal -v${{ env.CACHE_VERSION }}
192
180
- name : Setup dependencies
193
181
run : |
194
- ./deps/PawPaw/.github/workflows/bootstrap-deps.sh macos-${{ matrix.target }}
182
+ ./deps/PawPaw/.github/workflows/bootstrap-deps.sh macos-universal-10.15
195
183
- name : Build extra dependencies
196
184
run : |
197
185
export PATH="/usr/local/opt/ccache/libexec:${PATH}"
198
- ./deps/PawPaw/bootstrap-cardinal.sh macos-${{ matrix.target }} && ./deps/PawPaw/.cleanup.sh macos-${{ matrix.target }}
186
+ ./deps/PawPaw/bootstrap-cardinal.sh macos-universal-10.15 && ./deps/PawPaw/.cleanup.sh macos-universal-10.15
199
187
- name : Set up ccache
200
188
if : steps.cache.outputs.cache-hit == 'true'
201
189
uses :
hendrikmuhs/[email protected]
202
190
with :
203
- key : ccache-macos-${{ matrix.target }}${{ env.TARGET_SUFFIX }} -v${{ env.CACHE_VERSION }}
191
+ key : ccache-macos-universal -v${{ env.CACHE_VERSION }}
204
192
- name : Build macOS (base)
205
193
if : steps.cache.outputs.cache-hit == 'true'
206
194
shell : bash
207
195
run : |
208
196
export PATH="/usr/local/opt/ccache/libexec:${PATH}"
209
- source deps/PawPaw/local.env macos-${{ matrix.target }}
197
+ source deps/PawPaw/local.env macos-universal-10.15
210
198
make features
211
199
make NOOPT=true ${MAKE_ARGS} -j $(sysctl -n hw.logicalcpu)
212
200
- name : Build macOS (packaging)
213
201
if : steps.cache.outputs.cache-hit == 'true'
214
202
shell : bash
215
203
run : |
216
- source deps/PawPaw/local.env macos-${{ matrix.target }}
204
+ source deps/PawPaw/local.env macos-universal-10.15
217
205
./utils/create-macos-installer.sh
218
206
- name : Set sha8 (non-release)
219
207
if : startsWith(github.ref, 'refs/tags/') != true
@@ -224,10 +212,10 @@ jobs:
224
212
- name : Rename macOS bundle
225
213
if : steps.cache.outputs.cache-hit == 'true'
226
214
run : |
227
- mv ${{ github.event.repository.name }}-macOS.pkg ${{ github.event.repository.name }}-macOS-${{ matrix.target }}${{ env.TARGET_SUFFIX }} -${{ github.event.pull_request.number || env.SHA8 }}.pkg
215
+ mv ${{ github.event.repository.name }}-macOS.pkg ${{ github.event.repository.name }}-macOS-universal -${{ github.event.pull_request.number || env.SHA8 }}.pkg
228
216
- uses : actions/upload-artifact@v4
229
217
with :
230
- name : ${{ github.event.repository.name }}-macOS-${{ matrix.target }}${{ env.TARGET_SUFFIX }} -${{ github.event.pull_request.number || env.SHA8 }}
218
+ name : ${{ github.event.repository.name }}-macOS-universal -${{ github.event.pull_request.number || env.SHA8 }}
231
219
path : |
232
220
${{ github.event.repository.name }}-*.pkg
233
221
- uses : softprops/action-gh-release@v1
0 commit comments