Skip to content

Commit a5f83c2

Browse files
authored
[CI] Fix sycl-rel-nightly.yml (#16560)
The workflow was introduced with errors. Fix them and also turn off the pre-commit for changes in this workflow.
1 parent 03cb2b2 commit a5f83c2

5 files changed

+14
-7
lines changed

.github/workflows/sycl-linux-build.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,6 @@ on:
5050
description: 'Artifacts retention period'
5151
type: string
5252
default: 3
53-
ref:
54-
type: string
55-
required: false
5653

5754
outputs:
5855
build_conclusion:
@@ -146,7 +143,6 @@ jobs:
146143
with:
147144
sparse-checkout: |
148145
devops/actions
149-
ref: ${{ inputs.ref || github.sha }}
150146
# Cleanup will be run after all actions are completed.
151147
- name: Register cleanup after job is finished
152148
uses: ./devops/actions/cleanup

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ on:
2121
- '.github/workflows/sycl-windows-*.yml'
2222
- '.github/workflows/sycl-macos-*.yml'
2323
- '.github/workflows/sycl-nightly.yml'
24+
- '.github/workflows/sycl-rel-nightly.yml'
2425
- 'devops/containers/**'
2526
- 'devops/actions/build_container/**'
2627

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ jobs:
3636
secrets: inherit
3737
with:
3838
build_cache_root: "/__w/"
39-
build_artifact_suffix: v6
39+
build_artifact_suffix: default
4040
build_configure_extra_args: '--hip --cuda'
4141
merge_ref: ''
42-
ref: sycl-rel-6_0_0
42+
build_ref: sycl-rel-6_0_0
4343

4444
# We upload the build for people to download/use, override its name and
4545
# prefer widespread gzip compression.
@@ -118,10 +118,12 @@ jobs:
118118
if: ${{ github.repository == 'intel/llvm' && needs.check_for_new_commits.outputs.is_new_commit != 'false' }}
119119
uses: ./.github/workflows/sycl-windows-build.yml
120120
with:
121+
merge_ref: ''
122+
build_ref: sycl-rel-6_0_0
123+
121124
# We upload both Linux/Windows build via Github's "Releases"
122125
# functionality, make sure Linux/Windows names follow the same pattern.
123126
artifact_archive_name: sycl_windows.tar.gz
124-
build_ref: sycl-rel-6_0_0
125127

126128
e2e-win:
127129
needs: build-win

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@ on:
1818
description: 'Filter matches for the changed files in the PR'
1919
default: '[llvm, clang, sycl, llvm_spirv, xptifw, libclc, libdevice]'
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'
2127
artifact_archive_name:
2228
type: string
2329
default: llvm_sycl.tar.gz
@@ -100,6 +106,7 @@ jobs:
100106
with:
101107
path: src
102108
ref: ${{ inputs.build_ref || github.sha }}
109+
merge_ref: ${{ inputs.merge_ref }}
103110
cache_path: "D:\\\\github\\\\_work\\\\repo_cache\\\\"
104111
- name: Configure
105112
shell: cmd

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ on:
2020
- '.github/workflows/sycl-precommit-aws.yml'
2121
- '.github/workflows/sycl-macos-*.yml'
2222
- '.github/workflows/sycl-nightly.yml'
23+
- '.github/workflows/sycl-rel-nightly.yml'
2324
- 'devops/containers/**'
2425
- 'devops/actions/build_container/**'
2526

0 commit comments

Comments
 (0)