Skip to content

Commit ddfb600

Browse files
committed
fix: checkout easy-gl sibling repo for CNA's EASYGL backend in CI
Configure now gets past SDL3's X11/XTEST checks (previous 2 commits) but hard-fails one step later: "CNA: Missing sibling repository 'easy-gl'". CNA's CNA_BACKEND_EASY_GL option -- enabled by every entry in this job's backend matrix, since the single "Configure editor" step always configures both EASYGL and Vulkan regardless of which one is the matrix's "primary" backend that run -- requires a sibling ../easy-gl checkout (add_subdirectory(../easy-gl), not a submodule of CNA). ci.yml checked out cna and sharp-runtime as siblings but never easy-gl. Added a "Checkout easy-gl" step to both the editor matrix job and the Editor (EASYGL) ASan+UBSan job, mirroring the existing cna/sharp-runtime checkout pattern exactly. Pinned to 62c0a248a6c4144abaf92c0530cc2a2395e5fd37 -- the current tip of this sandbox's own easy-gl sibling checkout, the only revision confirmed to build successfully together with a CNA checkout locally (this sandbox's local cna is a newer revision than CI's pinned d0c21ee6, so this isn't a guarantee the exact pairing CI uses is compatible, only the best available evidence; a real CI run will confirm or reveal a version mismatch directly).
1 parent 22ebe57 commit ddfb600

1 file changed

Lines changed: 31 additions & 4 deletions

File tree

.github/workflows/ci.yml

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,13 @@
88
# fixture. For exact live counts run `ctest -N`; they are deliberately not
99
# hard-coded here.
1010
#
11-
# The editor job below checks out the two required sibling repositories beside
12-
# this checkout, exactly matching the root CMake project layout
13-
# (`../cna`, `../sharp-runtime`). EASYGL runs the complete root CTest suite,
14-
# while the Vulkan matrix entry always configures and builds the real editor.
11+
# The editor job below checks out the three required sibling repositories
12+
# beside this checkout, exactly matching the root CMake project layout
13+
# (`../cna`, `../sharp-runtime`, `../easy-gl` -- the last one only because
14+
# CNA's own CNA_BACKEND_EASY_GL option, which every matrix entry enables,
15+
# requires it as a sibling checkout). EASYGL runs the complete root CTest
16+
# suite, while the Vulkan matrix entry always configures and builds the real
17+
# editor.
1518
# Vulkan is enabled for the explicit manual SYS-W8-05 qualification run;
1619
# WebGPU remains gated pending its own pixel-qualified runner.
1720

@@ -261,6 +264,20 @@ jobs:
261264
path: sharp-runtime
262265
ref: 5cdaafb2bace46dce5393da21dad9ff9f8ad3c58
263266

267+
# CNA's CNA_BACKEND_EASY_GL option (which the EASYGL backend this job
268+
# matrix builds turns on) requires a sibling 'easy-gl' checkout --
269+
# CNA's own CMakeLists.txt hard-fails configure without it
270+
# ("Missing sibling repository 'easy-gl'"). Every matrix entry needs
271+
# it, not just EASYGL: the single "Configure editor" step below always
272+
# configures both backends (it's followed by both an EASYGL-only build
273+
# step and an unconditioned "Build Vulkan editor" step).
274+
- name: Checkout easy-gl
275+
uses: actions/checkout@v4
276+
with:
277+
repository: openeggbert/easy-gl
278+
path: easy-gl
279+
ref: 62c0a248a6c4144abaf92c0530cc2a2395e5fd37
280+
264281
- name: Install editor build dependencies
265282
run: |
266283
sudo apt-get update
@@ -351,6 +368,16 @@ jobs:
351368
path: sharp-runtime
352369
ref: 5cdaafb2bace46dce5393da21dad9ff9f8ad3c58
353370

371+
# See the "editor" job's own "Checkout easy-gl" step comment: CNA's
372+
# CNA_BACKEND_EASY_GL option (which this EASYGL-specific job enables)
373+
# requires a sibling 'easy-gl' checkout or configure hard-fails.
374+
- name: Checkout easy-gl
375+
uses: actions/checkout@v4
376+
with:
377+
repository: openeggbert/easy-gl
378+
path: easy-gl
379+
ref: 62c0a248a6c4144abaf92c0530cc2a2395e5fd37
380+
354381
- name: Install editor build dependencies
355382
run: |
356383
sudo apt-get update

0 commit comments

Comments
 (0)