Skip to content

Commit b18c834

Browse files
committed
pass NSC_IMAGE_NAME with ENV as it glitches when using CMake CLI due to . and / chars
1 parent 353c467 commit b18c834

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

.github/workflows/build-nabla.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ jobs:
7777
--entrypoint ${{ env.entry }} -di --isolation process `
7878
--env-file .\docker\ci-windows.env `
7979
--env-file .\docker\ninja.env `
80+
--env "NSC_IMAGE_NAME=${{ steps.set-prefix.outputs.nscTargetTaggedImage }}" `
8081
--name orphan --network docker_default `
8182
-v "${{ github.workspace }}:${{ env.mount }}" `
8283
-v "${pipeHost}:\\.\pipe\dockerd" -e "DOCKER_HOST=npipe:////./pipe/dockerd" `
@@ -100,8 +101,7 @@ jobs:
100101
${{ env.entry }} ${{ env.cmd }} -Command cmake `
101102
--preset ci-configure-dynamic-${{ matrix.vendor }} `
102103
--profiling-output=profiling/cmake-profiling.json `
103-
--profiling-format=google-trace `
104-
"-DNSC_IMAGE_NAME=${{ steps.set-prefix.outputs.nscTargetTaggedImage }}"
104+
--profiling-format=google-trace
105105
106106
- name: Container – Build NSC
107107
run: |

tools/nsc/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,9 @@ LABEL org.opencontainers.image.description="[Nabla Shader Compiler (NSC)]: @ORG_
225225
set(DOCKERFILE "${NBL_DOCKER_CTX_DIR}/Dockerfile")
226226
file(WRITE "${DOCKERFILE}" "${INSTRUCTIONS}")
227227

228-
if(NOT DEFINED NSC_IMAGE_NAME)
228+
if(DEFINED ENV{NSC_IMAGE_NAME})
229+
set(NSC_IMAGE_NAME "$ENV{NSC_IMAGE_NAME}")
230+
else()
229231
set(NSC_IMAGE_NAME nano/godbolt/nsc)
230232
endif()
231233

0 commit comments

Comments
 (0)