Skip to content

Commit cb0c865

Browse files
committed
Try to move container to optix workflow file
Signed-off-by: Larry Gritz <[email protected]>
1 parent e9ff6dc commit cb0c865

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

.github/workflows/build-steps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090
runs-on: ${{ inputs.runner }}
9191
container:
9292
image: ${{ inputs.container }}
93-
options: ${{ inputs.container_options }}
93+
# options: ${{ inputs.container_options }}
9494
env:
9595
CXX: ${{inputs.cxx_compiler}}
9696
CC: ${{inputs.cc_compiler}}

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ jobs:
215215
nametag: ${{ matrix.nametag || 'unnamed!' }}
216216
runner: ${{ matrix.runner || 'ubuntu-latest' }}
217217
container: ${{ matrix.container }}
218-
container_options: ${{ matrix.container_options || -e A=x }}
218+
container_options: ${{ matrix.container_options || '-e A=x' }}
219219
cc_compiler: ${{ matrix.cc_compiler || 'gcc' }}
220220
cxx_compiler: ${{ matrix.cxx_compiler || 'g++' }}
221221
cxx_std: ${{ matrix.cxx_std || '17' }}
@@ -499,7 +499,7 @@ jobs:
499499
nametag: ${{ matrix.nametag || 'unnamed!' }}
500500
runner: ${{ matrix.runner }}
501501
container: ${{ matrix.container }}
502-
container_options: ${{ matrix.container_options || -e A=x }}
502+
container_options: ${{ matrix.container_options || '-e A=x' }}
503503
cc_compiler: ${{ matrix.cc_compiler || 'clang' }}
504504
cxx_compiler: ${{ matrix.cxx_compiler || 'clang++' }}
505505
cxx_std: ${{ matrix.cxx_std || '17' }}
@@ -569,7 +569,7 @@ jobs:
569569
nametag: ${{ matrix.nametag || 'unnamed!' }}
570570
runner: ${{ matrix.runner }}
571571
container: ${{ matrix.container }}
572-
container_options: ${{ matrix.container_options || -e A=x }}
572+
container_options: ${{ matrix.container_options || '-e A=x' }}
573573
cc_compiler: ${{ matrix.cc_compiler }}
574574
cxx_compiler: ${{ matrix.cxx_compiler }}
575575
cxx_std: ${{ matrix.cxx_std || '17' }}

.github/workflows/optix.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,10 @@ jobs:
7777
sonar: ${{ matrix.sonar || 0 }}
7878
llvm_action_ver: ${{ matrix.llvm_action_ver }}
7979
clang_format: ${{ matrix.clang_format }}
80+
runs-on: ${{ matrix.runner }}
81+
container:
82+
image: ${{ matrix.container }}
83+
options: ${{ matrix.container_options }}
8084
strategy:
8185
fail-fast: false
8286
matrix:

0 commit comments

Comments
 (0)