Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions .github/workflows/sycl-linux-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,13 @@ on:
type: string
default: llvm_sycl.tar.zst

pack_release:
release_toolchain_artifact:
type: string
required: false
description: |
If provided, create an addition toolchain artifact with the same name
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo?
Same for windows

Suggested change
If provided, create an addition toolchain artifact with the same name
If provided, create an additional toolchain artifact with the same name

(`inputs.toolchain_artifact_filename`) as `toolchain_artifact` above
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a bit confusing. It's an archive name, not an artifact name, isn't it? From this sentence it seems like it creates one more "sycl_linux_default" or so. Can't we say "If provided, create an additional toolchain artifact without utilities used for testing called inputs.release_toolchain_artifact or just "If provided, create an additional toolchain artifact without utilities used for testing"?

but without utilities used for testing.

e2e_binaries_artifact:
type: string
Expand Down Expand Up @@ -117,18 +121,15 @@ on:
options:
- "default"

toolchain_artifact:
type: choice
options:
- "sycl_linux_default"
retention-days:
type: choice
options:
- 3

pack_release:
type: string
required: false
toolchain_artifact:
type: choice
options:
- "sycl_linux_default"

permissions: read-all

Expand Down Expand Up @@ -272,13 +273,13 @@ jobs:
cmake --build $GITHUB_WORKSPACE/build --target deploy-sycl-toolchain

- name: Pack toolchain release
if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' && inputs.pack_release == 'true' }}
if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' && inputs.release_toolchain_artifact != '' }}
run: tar -I '${{ steps.artifact_info.outputs.COMPRESS }}' -cf ${{ steps.artifact_info.outputs.ARCHIVE_NAME }} -C $GITHUB_WORKSPACE/toolchain .
- name: Upload toolchain release
if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' && inputs.pack_release == 'true' }}
if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' && inputs.release_toolchain_artifact != '' }}
uses: actions/upload-artifact@v4
with:
name: sycl_linux_release
name: ${{ inputs.release_toolchain_artifact }}
path: ${{ steps.artifact_info.outputs.ARCHIVE_NAME }}
retention-days: ${{ inputs.retention-days }}

Expand Down
20 changes: 11 additions & 9 deletions .github/workflows/sycl-windows-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,16 @@ on:
toolchain_artifact_filename:
type: string
default: llvm_sycl.tar.gz
e2e_binaries_artifact:

release_toolchain_artifact:
type: string
required: false
description: |
If provided, create an addition toolchain artifact with the same name
(`inputs.toolchain_artifact_filename`) as `toolchain_artifact` above
but without utilities used for testing.

pack_release:
e2e_binaries_artifact:
type: string
required: false

Expand Down Expand Up @@ -86,10 +91,7 @@ on:
options:
- cl
- icx
pack_release:
type: string
required: false


permissions: read-all

jobs:
Expand Down Expand Up @@ -206,13 +208,13 @@ jobs:
cmake --build build --target deploy-sycl-toolchain

- name: Pack toolchain release
if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' && inputs.pack_release == 'true' }}
if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' && inputs.release_toolchain_artifact != '' }}
run: tar -czf ${{ inputs.toolchain_artifact_filename }} -C install .
- name: Upload toolchain release
if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' && inputs.pack_release == 'true' }}
if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' && inputs.release_toolchain_artifact != '' }}
uses: actions/upload-artifact@v4
with:
name: sycl_windows_release
name: ${{ inputs.release_toolchain_artifact }}
path: ${{ inputs.toolchain_artifact_filename }}
retention-days: ${{ inputs.retention-days }}

Expand Down
Loading