File tree Expand file tree Collapse file tree 2 files changed +11
-2
lines changed Expand file tree Collapse file tree 2 files changed +11
-2
lines changed Original file line number Diff line number Diff line change @@ -119,8 +119,8 @@ jobs:
119
119
if : ${{ github.repository == 'intel/llvm' && needs.check_for_new_commits.outputs.is_new_commit != 'false' }}
120
120
uses : ./.github/workflows/sycl-windows-build.yml
121
121
with :
122
+ ref : sycl-rel-6_0_0
122
123
merge_ref : ' '
123
- build_ref : sycl-rel-6_0_0
124
124
125
125
# We upload both Linux/Windows build via Github's "Releases"
126
126
# functionality, make sure Linux/Windows names follow the same pattern.
@@ -140,6 +140,7 @@ jobs:
140
140
sycl_toolchain_archive : ${{ needs.build-win.outputs.artifact_archive_name }}
141
141
extra_lit_opts : --param gpu-intel-gen12=True
142
142
ref : sycl-rel-6_0_0
143
+ merge_ref : ' '
143
144
144
145
cuda-aws-start :
145
146
needs : [ubuntu2204_build]
Original file line number Diff line number Diff line change 18
18
ref :
19
19
type : string
20
20
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
21
28
22
29
sycl_toolchain_artifact :
23
30
type : string
68
75
- uses : ./devops/actions/cached_checkout
69
76
with :
70
77
path : llvm
71
- ref : ${{ inputs.build_ref || github.sha }}
78
+ ref : ${{ inputs.ref || github.sha }}
79
+ merge_ref : ${{ inputs.merge_ref }}
72
80
cache_path : " D:\\\\ github\\\\ _work\\\\ repo_cache\\\\ "
73
81
- name : Download compiler toolchain
74
82
uses : actions/download-artifact@v4
You can’t perform that action at this time.
0 commit comments