@@ -157,23 +157,11 @@ jobs:
157157 *.tar.xz
158158
159159 macos :
160- strategy :
161- matrix :
162- debug : [0, 1]
163- target : [universal-10.15]
164160 runs-on : macos-12
165161 steps :
166162 - uses : actions/checkout@v4
167163 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
177165 - name : Set up cache
178166 id : cache
179167 uses : actions/cache@v4
@@ -188,32 +176,32 @@ jobs:
188176 src/Rack/dep/libarchive-3.4.3
189177 src/Rack/dep/libsamplerate-0.1.9
190178 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 }}
192180 - name : Setup dependencies
193181 run : |
194- ./deps/PawPaw/.github/workflows/bootstrap-deps.sh macos-${{ matrix.target }}
182+ ./deps/PawPaw/.github/workflows/bootstrap-deps.sh macos-universal-10.15
195183 - name : Build extra dependencies
196184 run : |
197185 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
199187 - name : Set up ccache
200188 if : steps.cache.outputs.cache-hit == 'true'
201189 uses : hendrikmuhs/ccache-action@v1.2
202190 with :
203- key : ccache-macos-${{ matrix.target }}${{ env.TARGET_SUFFIX }} -v${{ env.CACHE_VERSION }}
191+ key : ccache-macos-universal -v${{ env.CACHE_VERSION }}
204192 - name : Build macOS (base)
205193 if : steps.cache.outputs.cache-hit == 'true'
206194 shell : bash
207195 run : |
208196 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
210198 make features
211199 make NOOPT=true ${MAKE_ARGS} -j $(sysctl -n hw.logicalcpu)
212200 - name : Build macOS (packaging)
213201 if : steps.cache.outputs.cache-hit == 'true'
214202 shell : bash
215203 run : |
216- source deps/PawPaw/local.env macos-${{ matrix.target }}
204+ source deps/PawPaw/local.env macos-universal-10.15
217205 ./utils/create-macos-installer.sh
218206 - name : Set sha8 (non-release)
219207 if : startsWith(github.ref, 'refs/tags/') != true
@@ -224,10 +212,10 @@ jobs:
224212 - name : Rename macOS bundle
225213 if : steps.cache.outputs.cache-hit == 'true'
226214 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
228216 - uses : actions/upload-artifact@v4
229217 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 }}
231219 path : |
232220 ${{ github.event.repository.name }}-*.pkg
233221 - uses : softprops/action-gh-release@v1
0 commit comments