File tree Expand file tree Collapse file tree 2 files changed +5
-3
lines changed Expand file tree Collapse file tree 2 files changed +5
-3
lines changed Original file line number Diff line number Diff line change 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 : |
Original file line number Diff line number Diff line change @@ -225,7 +225,9 @@ LABEL org.opencontainers.image.description="[Nabla Shader Compiler (NSC)]: @ORG_
225225set (DOCKERFILE "${NBL_DOCKER_CTX_DIR} /Dockerfile" )
226226file (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)
230232endif ()
231233
You can’t perform that action at this time.
0 commit comments