Skip to content

Commit 29f3f0c

Browse files
committed
fix: checkout meta-gl sibling repo needed by easy-gl in CI
Configure now gets past everything fixed so far (previous 4 commits) and hard-fails one layer deeper: easy-gl's own CMakeLists.txt does add_subdirectory(../meta-gl), a second sibling requirement -- CI never checked that out either. Added a "Checkout meta-gl" step to both editor jobs, same pattern/reasoning as the easy-gl fix (pinned to this sandbox's own meta-gl sibling's current HEAD, the best available evidence of a working combination). Also confirmed via this same CI run: the Clang ASan+UBSan and bounded fuzz job is now fully green (tinyobjloader ODR fix + mcb_libfuzzer rss-mib fix both hold on real CI), and the Vulkan matrix entry's Configure editor step now succeeds completely (it fails later, at Build Vulkan editor, on a real compile error inside sharp-runtime's own source -- out of scope for this workflow-file fix, tracked separately).
1 parent 8937da2 commit 29f3f0c

1 file changed

Lines changed: 21 additions & 3 deletions

File tree

.github/workflows/ci.yml

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,16 @@ jobs:
278278
path: easy-gl
279279
ref: 62c0a248a6c4144abaf92c0530cc2a2395e5fd37
280280

281+
# easy-gl's own CMakeLists.txt in turn add_subdirectory(../meta-gl)s --
282+
# a second, one-deeper sibling requirement discovered the same way as
283+
# easy-gl itself above.
284+
- name: Checkout meta-gl
285+
uses: actions/checkout@v4
286+
with:
287+
repository: openeggbert/meta-gl
288+
path: meta-gl
289+
ref: d51fcd7f455de8e3df3549edbed84f2b5527f18a
290+
281291
- name: Install editor build dependencies
282292
run: |
283293
sudo apt-get update
@@ -369,16 +379,24 @@ jobs:
369379
path: sharp-runtime
370380
ref: 5cdaafb2bace46dce5393da21dad9ff9f8ad3c58
371381

372-
# See the "editor" job's own "Checkout easy-gl" step comment: CNA's
373-
# CNA_BACKEND_EASY_GL option (which this EASYGL-specific job enables)
374-
# requires a sibling 'easy-gl' checkout or configure hard-fails.
382+
# See the "editor" job's own "Checkout easy-gl"/"Checkout meta-gl" step
383+
# comments: CNA's CNA_BACKEND_EASY_GL option (which this EASYGL-
384+
# specific job enables) requires a sibling 'easy-gl' checkout, which in
385+
# turn requires a sibling 'meta-gl' checkout, or configure hard-fails.
375386
- name: Checkout easy-gl
376387
uses: actions/checkout@v4
377388
with:
378389
repository: openeggbert/easy-gl
379390
path: easy-gl
380391
ref: 62c0a248a6c4144abaf92c0530cc2a2395e5fd37
381392

393+
- name: Checkout meta-gl
394+
uses: actions/checkout@v4
395+
with:
396+
repository: openeggbert/meta-gl
397+
path: meta-gl
398+
ref: d51fcd7f455de8e3df3549edbed84f2b5527f18a
399+
382400
- name: Install editor build dependencies
383401
run: |
384402
sudo apt-get update

0 commit comments

Comments
 (0)