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 77
77
--entrypoint ${{ env.entry }} -di --isolation process `
78
78
--env-file .\docker\ci-windows.env `
79
79
--env-file .\docker\ninja.env `
80
+ --env "NSC_IMAGE_NAME=${{ steps.set-prefix.outputs.nscTargetTaggedImage }}" `
80
81
--name orphan --network docker_default `
81
82
-v "${{ github.workspace }}:${{ env.mount }}" `
82
83
-v "${pipeHost}:\\.\pipe\dockerd" -e "DOCKER_HOST=npipe:////./pipe/dockerd" `
@@ -100,8 +101,7 @@ jobs:
100
101
${{ env.entry }} ${{ env.cmd }} -Command cmake `
101
102
--preset ci-configure-dynamic-${{ matrix.vendor }} `
102
103
--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
105
105
106
106
- name : Container – Build NSC
107
107
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_
225
225
set (DOCKERFILE "${NBL_DOCKER_CTX_DIR} /Dockerfile" )
226
226
file (WRITE "${DOCKERFILE} " "${INSTRUCTIONS} " )
227
227
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 ()
229
231
set (NSC_IMAGE_NAME nano/godbolt/nsc )
230
232
endif ()
231
233
You can’t perform that action at this time.
0 commit comments