Skip to content

Commit e193e79

Browse files
[CI] Change pack_release -> release_toolchain_artifact input (#19646)
It's unused in trunk and is only passed in `sycl-rel-nightly.yml` in `sycl-rel-*` branches (trunk version of it is an empty dummy stub). Not sure how future "release" branches are expected to get one. I think making the change results in better alignment between different artifacts produced the workflow, no other reasons beyond that.
1 parent 109d582 commit e193e79

File tree

2 files changed

+23
-20
lines changed

2 files changed

+23
-20
lines changed

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

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,13 @@ on:
5858
type: string
5959
default: llvm_sycl.tar.zst
6060

61-
pack_release:
61+
release_toolchain_artifact:
6262
type: string
6363
required: false
64+
description: |
65+
If provided, create an additional toolchain artifact without utilities
66+
used for testing in it. File name of the archive is the same as in the
67+
`toolchain_artifact` above.
6468
6569
e2e_binaries_artifact:
6670
type: string
@@ -117,18 +121,15 @@ on:
117121
options:
118122
- "default"
119123

120-
toolchain_artifact:
121-
type: choice
122-
options:
123-
- "sycl_linux_default"
124124
retention-days:
125125
type: choice
126126
options:
127127
- 3
128128

129-
pack_release:
130-
type: string
131-
required: false
129+
toolchain_artifact:
130+
type: choice
131+
options:
132+
- "sycl_linux_default"
132133

133134
permissions: read-all
134135

@@ -272,13 +273,13 @@ jobs:
272273
cmake --build $GITHUB_WORKSPACE/build --target deploy-sycl-toolchain
273274
274275
- name: Pack toolchain release
275-
if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' && inputs.pack_release == 'true' }}
276+
if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' && inputs.release_toolchain_artifact != '' }}
276277
run: tar -I '${{ steps.artifact_info.outputs.COMPRESS }}' -cf ${{ steps.artifact_info.outputs.ARCHIVE_NAME }} -C $GITHUB_WORKSPACE/toolchain .
277278
- name: Upload toolchain release
278-
if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' && inputs.pack_release == 'true' }}
279+
if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' && inputs.release_toolchain_artifact != '' }}
279280
uses: actions/upload-artifact@v4
280281
with:
281-
name: sycl_linux_release
282+
name: ${{ inputs.release_toolchain_artifact }}
282283
path: ${{ steps.artifact_info.outputs.ARCHIVE_NAME }}
283284
retention-days: ${{ inputs.retention-days }}
284285

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

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,16 @@ on:
3737
toolchain_artifact_filename:
3838
type: string
3939
default: llvm_sycl.tar.gz
40-
e2e_binaries_artifact:
40+
41+
release_toolchain_artifact:
4142
type: string
4243
required: false
44+
description: |
45+
If provided, create an additional toolchain artifact without utilities
46+
used for testing in it. File name of the archive is the same as in the
47+
`toolchain_artifact` above.
4348
44-
pack_release:
49+
e2e_binaries_artifact:
4550
type: string
4651
required: false
4752

@@ -86,10 +91,7 @@ on:
8691
options:
8792
- cl
8893
- icx
89-
pack_release:
90-
type: string
91-
required: false
92-
94+
9395
permissions: read-all
9496

9597
jobs:
@@ -206,13 +208,13 @@ jobs:
206208
cmake --build build --target deploy-sycl-toolchain
207209
208210
- name: Pack toolchain release
209-
if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' && inputs.pack_release == 'true' }}
211+
if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' && inputs.release_toolchain_artifact != '' }}
210212
run: tar -czf ${{ inputs.toolchain_artifact_filename }} -C install .
211213
- name: Upload toolchain release
212-
if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' && inputs.pack_release == 'true' }}
214+
if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' && inputs.release_toolchain_artifact != '' }}
213215
uses: actions/upload-artifact@v4
214216
with:
215-
name: sycl_windows_release
217+
name: ${{ inputs.release_toolchain_artifact }}
216218
path: ${{ inputs.toolchain_artifact_filename }}
217219
retention-days: ${{ inputs.retention-days }}
218220

0 commit comments

Comments
 (0)