Skip to content

Commit 878279e

Browse files
committed
ci(macos): run the GPU artifact build on macos-port push
bar-lobby consumes the macos-build-gpu.yml artifact, but that workflow was workflow_dispatch-only, so a macos-port push produced no artifact and the lobby macOS job failed. Trigger the GPU build on macos-port push (toolchain cached); drop macos-port from the compat build to avoid double-building. Also assert the KosmicKrisp dylib the ICD references.
1 parent be63240 commit 878279e

2 files changed

Lines changed: 11 additions & 4 deletions

File tree

.github/workflows/macos-build-gpu.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,14 @@ name: Build macOS Engine (GPU / Mesa 26.2 KosmicKrisp)
2626
# pr-downloader. Only engine-built base content + the engine binaries ship.
2727

2828
on:
29-
# Manual only: the from-source Mesa 26.2 + LLVM 19 toolchain build is heavy,
30-
# so it is not run on every push to the consolidated branch. Trigger it when
31-
# a GPU artifact is wanted. The compat build (macos-build.yml) runs on push.
3229
workflow_dispatch:
30+
# bar-lobby consumes THIS build's artifact (the KosmicKrisp GPU engine), so it
31+
# must run on macos-port pushes, not just manually. The heavy Mesa 26.2 + LLVM
32+
# 19 toolchain is cached (key mesa262-kk-llvm19-*), so after the first run a
33+
# push rebuilds only the engine, not the toolchain.
34+
push:
35+
branches:
36+
- macos-port
3337

3438
permissions:
3539
contents: read
@@ -320,6 +324,7 @@ jobs:
320324
# ---- Verify the required tree, then pack ----
321325
for required in bin/spring bin/spring-headless bin/pr-downloader \
322326
share/vulkan/icd.d/kosmickrisp.json \
327+
lib/libvulkan_kosmickrisp.dylib \
323328
game/fonts/FreeSansBold.otf \
324329
game/games/springcontent.sdz game/games/bitmaps.sdz \
325330
game/games/maphelper.sdz game/games/cursors.sdz; do

.github/workflows/macos-build.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,10 @@ on:
2727
- master
2828
push:
2929
branches:
30+
# macos-port is built by macos-build-gpu.yml (the KosmicKrisp artifact
31+
# bar-lobby consumes); this compat/llvmpipe build stays on master only to
32+
# avoid double-building macOS on every macos-port push.
3033
- master
31-
- macos-port
3234

3335
permissions:
3436
contents: read

0 commit comments

Comments
 (0)