Skip to content

[CI] Fix sycl-rel-nightly.yml #16560

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
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
4 changes: 0 additions & 4 deletions .github/workflows/sycl-linux-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,6 @@ on:
description: 'Artifacts retention period'
type: string
default: 3
ref:
Copy link
Contributor Author

@KornevNikita KornevNikita Jan 8, 2025

Choose a reason for hiding this comment

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

Note for reviewers: I added these changes (and one below) previously, but they are not needed actually, so removing them.

type: string
required: false

outputs:
build_conclusion:
Expand Down Expand Up @@ -146,7 +143,6 @@ jobs:
with:
sparse-checkout: |
devops/actions
ref: ${{ inputs.ref || github.sha }}
# Cleanup will be run after all actions are completed.
- name: Register cleanup after job is finished
uses: ./devops/actions/cleanup
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/sycl-linux-precommit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ on:
- '.github/workflows/sycl-windows-*.yml'
- '.github/workflows/sycl-macos-*.yml'
- '.github/workflows/sycl-nightly.yml'
- '.github/workflows/sycl-rel-nightly.yml'
- 'devops/containers/**'
- 'devops/actions/build_container/**'

Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/sycl-rel-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ jobs:
secrets: inherit
with:
build_cache_root: "/__w/"
build_artifact_suffix: v6
build_artifact_suffix: default
build_configure_extra_args: '--hip --cuda'
merge_ref: ''
ref: sycl-rel-6_0_0
build_ref: sycl-rel-6_0_0

# We upload the build for people to download/use, override its name and
# prefer widespread gzip compression.
Expand Down Expand Up @@ -118,10 +118,12 @@ jobs:
if: ${{ github.repository == 'intel/llvm' && needs.check_for_new_commits.outputs.is_new_commit != 'false' }}
uses: ./.github/workflows/sycl-windows-build.yml
with:
merge_ref: ''
build_ref: sycl-rel-6_0_0

# We upload both Linux/Windows build via Github's "Releases"
# functionality, make sure Linux/Windows names follow the same pattern.
artifact_archive_name: sycl_windows.tar.gz
build_ref: sycl-rel-6_0_0

e2e-win:
needs: build-win
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/sycl-windows-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@ on:
description: 'Filter matches for the changed files in the PR'
default: '[llvm, clang, sycl, llvm_spirv, xptifw, libclc, libdevice]'
required: false
merge_ref:
description: |
Commit-ish to merge post-checkout if non-empty. Must be reachable from
the default_branch input paramter.
type: string
default: 'FETCH_HEAD'
artifact_archive_name:
type: string
default: llvm_sycl.tar.gz
Expand Down Expand Up @@ -100,6 +106,7 @@ jobs:
with:
path: src
ref: ${{ inputs.build_ref || github.sha }}
merge_ref: ${{ inputs.merge_ref }}
cache_path: "D:\\\\github\\\\_work\\\\repo_cache\\\\"
- name: Configure
shell: cmd
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/sycl-windows-precommit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ on:
- '.github/workflows/sycl-precommit-aws.yml'
- '.github/workflows/sycl-macos-*.yml'
- '.github/workflows/sycl-nightly.yml'
- '.github/workflows/sycl-rel-nightly.yml'
- 'devops/containers/**'
- 'devops/actions/build_container/**'

Expand Down
Loading