Skip to content

Commit 2a312c9

Browse files
authored
[CI] Update sycl-windows-run-tests.yml (#16621)
Added merge_ref to inputs. Use ref instead of undeclared build_ref.
1 parent 0b28ba2 commit 2a312c9

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

.github/workflows/sycl-rel-nightly.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@ jobs:
119119
if: ${{ github.repository == 'intel/llvm' && needs.check_for_new_commits.outputs.is_new_commit != 'false' }}
120120
uses: ./.github/workflows/sycl-windows-build.yml
121121
with:
122+
ref: sycl-rel-6_0_0
122123
merge_ref: ''
123-
build_ref: sycl-rel-6_0_0
124124

125125
# We upload both Linux/Windows build via Github's "Releases"
126126
# functionality, make sure Linux/Windows names follow the same pattern.
@@ -140,6 +140,7 @@ jobs:
140140
sycl_toolchain_archive: ${{ needs.build-win.outputs.artifact_archive_name }}
141141
extra_lit_opts: --param gpu-intel-gen12=True
142142
ref: sycl-rel-6_0_0
143+
merge_ref: ''
143144

144145
cuda-aws-start:
145146
needs: [ubuntu2204_build]

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@ on:
1818
ref:
1919
type: string
2020
required: False
21+
merge_ref:
22+
description: |
23+
Commit-ish to merge post-checkout if non-empty. Must be reachable from
24+
the default_branch input paramter.
25+
type: string
26+
default: 'FETCH_HEAD'
27+
required: False
2128

2229
sycl_toolchain_artifact:
2330
type: string
@@ -68,7 +75,8 @@ jobs:
6875
- uses: ./devops/actions/cached_checkout
6976
with:
7077
path: llvm
71-
ref: ${{ inputs.build_ref || github.sha }}
78+
ref: ${{ inputs.ref || github.sha }}
79+
merge_ref: ${{ inputs.merge_ref }}
7280
cache_path: "D:\\\\github\\\\_work\\\\repo_cache\\\\"
7381
- name: Download compiler toolchain
7482
uses: actions/download-artifact@v4

0 commit comments

Comments
 (0)