Skip to content

Commit d32060a

Browse files
authored
[CI] Fix post-commit Windows job (#18322)
#18124 broke the windows post-commit, this should fix that due to removing the `compiler` variable from the E2E composite action, as well as not having listed a target device. This should fix that.
1 parent 8c62c24 commit d32060a

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

.github/workflows/sycl-post-commit.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ jobs:
117117
with:
118118
name: Intel GEN12 Graphics with Level Zero
119119
runner: '["Windows","gen12"]'
120+
target_devices: "level_zero:gpu"
120121
sycl_toolchain_archive: ${{ needs.build-win.outputs.artifact_archive_name }}
121122
compiler: icx
122123

.github/workflows/sycl-windows-run-tests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ jobs:
164164
target_devices: ${{ inputs.target_devices }}
165165
extra_lit_opts: ${{ inputs.extra_lit_opts }}
166166
retention-days: ${{ inputs.artifact_retention_days }}
167+
compiler: ${{ inputs.compiler }}
167168

168169
- name: Run SYCL CTS Tests
169170
if: inputs.tests_selector == 'cts'

devops/actions/run-tests/windows/e2e/action.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ inputs:
1717
required: false
1818
cxx_compiler:
1919
required: false
20-
20+
compiler:
21+
required: false
22+
default: "cl"
2123

2224
runs:
2325
using: "composite"
@@ -74,7 +76,7 @@ runs:
7476
LIT_OPTS: -v --no-progress-bar --show-unsupported --show-pass --show-xfail --max-time ${{ inputs.e2e_testing_mode == 'run-only' && 1200 || 3600 }} --time-tests --param print_features=True --param test-mode=${{ inputs.testing_mode }} --param sycl_devices=${{ inputs.target_devices }} ${{ inputs.extra_lit_opts }}
7577
run: |
7678
# Run E2E tests.
77-
if [[ ${{ inputs.cxx_compiler || '$(which clang++).exe' }} == 'icx' ]]; then
79+
if [[ ${{ inputs.compiler }} == 'icx' ]]; then
7880
export LIT_FILTER_OUT="compile_on_win_with_mdd"
7981
fi
8082
cmake --build build-e2e --target check-sycl-e2e > e2e.log 2>&1

0 commit comments

Comments
 (0)