diff options
| author | SulfurNitride <SulfurNitride@users.noreply.github.com> | 2026-02-23 02:05:50 -0600 |
|---|---|---|
| committer | SulfurNitride <SulfurNitride@users.noreply.github.com> | 2026-02-23 02:05:50 -0600 |
| commit | a8a287cd102001dddff30deec66140136da422d5 (patch) | |
| tree | a33f77ffff0d431a7b7cac7796a3e427fcd69da9 /docker/build-inner.sh | |
| parent | d22d8c267b012729b6b84142def2a30ca4691d7a (diff) | |
Fix CI: use Docker build like build.sh, fix GHCR uppercase tag
The CI was failing because ghcr.io/SulfurNitride/fluorine-builder had
uppercase letters (GHCR requires lowercase). Instead of depending on a
pre-built GHCR image, CI now builds the Docker image from the Dockerfile
each run (matching build.sh), with registry-based layer caching for speed.
Also removes the duplicated inline AppImage logic in favor of build-inner.sh.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Diffstat (limited to 'docker/build-inner.sh')
| -rwxr-xr-x | docker/build-inner.sh | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/docker/build-inner.sh b/docker/build-inner.sh index 847bfae..fa44a60 100755 --- a/docker/build-inner.sh +++ b/docker/build-inner.sh @@ -6,11 +6,20 @@ BUILD_PY="${BUILD_PYTHON:-$(command -v python3)}" # ── Build ── PYBIND11_DIR="$("${BUILD_PY}" -c 'import pybind11; print(pybind11.get_cmake_dir())' 2>/dev/null || true)" +CMAKE_EXTRA_ARGS=() +if [ -n "${CMAKE_C_COMPILER_LAUNCHER:-}" ]; then + CMAKE_EXTRA_ARGS+=("-DCMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER}") +fi +if [ -n "${CMAKE_CXX_COMPILER_LAUNCHER:-}" ]; then + CMAKE_EXTRA_ARGS+=("-DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}") +fi + cmake -S . -B build -G Ninja \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DPython_EXECUTABLE="${BUILD_PY}" \ ${PYBIND11_DIR:+-Dpybind11_DIR="${PYBIND11_DIR}"} \ - -DBUILD_PLUGIN_PYTHON=ON + -DBUILD_PLUGIN_PYTHON=ON \ + "${CMAKE_EXTRA_ARGS[@]}" cmake --build build --parallel |