Skip to content

Commit 4f29c44

Browse files
[CI] Fix race condition by unsetting merge_ref for Windows tasks (#16757)
That input parameter was introduced to `sycl-windows-build.yml` in #16560 but it's unclear why. Note that linux version has had it for quite some time, but we started unsetting it explicitly in #10720. The reason we had it for Linux in the first place is because `GITHUB_SHA` pointed to the PR's source branch for the `pull_request_target` trigger that we used at that time. With switching to `pull_request` trigger it became unnecessary as `GITHUB_SHA` points to the merge commit already. This change should fix current race condition when a post-commit CI job can test change landed after the current commit if there is a delay with runner allocation.
1 parent 094e555 commit 4f29c44

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ jobs:
106106
compiler: icx
107107
build_configure_extra_args: --cmake-opt=-DCMAKE_C_FLAGS="/clang:-Wno-nonportable-include-path /clang:-Wno-cast-function-type-mismatch" --cmake-opt=-DCMAKE_CXX_FLAGS="/clang:-Wno-nonportable-include-path /clang:-Wno-cast-function-type-mismatch" --cmake-opt="-DCMAKE_EXE_LINKER_FLAGS=/manifest:no" --cmake-opt="-DCMAKE_MODULE_LINKER_FLAGS=/manifest:no" --cmake-opt="-DCMAKE_SHARED_LINKER_FLAGS=/manifest:no"
108108
build_cache_suffix: icx
109+
merge_ref: ''
109110

110111
e2e-win:
111112
needs: build-win
@@ -120,6 +121,7 @@ jobs:
120121
runner: '["Windows","gen12"]'
121122
sycl_toolchain_archive: ${{ needs.build-win.outputs.artifact_archive_name }}
122123
compiler: icx
124+
merge_ref: ''
123125

124126
macos_default:
125127
name: macOS

.github/workflows/sycl-windows-precommit.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ jobs:
4242
uses: ./.github/workflows/sycl-windows-build.yml
4343
with:
4444
changes: ${{ needs.detect_changes.outputs.filters }}
45+
merge_ref: ''
4546

4647
e2e:
4748
needs: build
@@ -55,3 +56,4 @@ jobs:
5556
name: Intel GEN12 Graphics with Level Zero
5657
runner: '["Windows","gen12"]'
5758
sycl_toolchain_archive: ${{ needs.build.outputs.artifact_archive_name }}
59+
merge_ref: ''

0 commit comments

Comments
 (0)