Skip to content

[CI] Don't merge origin/sycl into post-commit/nightly #10143

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.

Sign up for GitHub

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
Jun 30, 2023
Merged

[CI] Don't merge origin/sycl into post-commit/nightly #10143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions .github/workflows/sycl_linux_build_and_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,10 @@ on:
description: 'Filter matches for the changed files in the PR'
default: '[llvm, clang, sycl, llvm_spirv, xptifw, libclc, libdevice]'
required: false
merge:
description: 'Merge default branch after the checkout'
type: boolean
default: true

jobs:
build:
Expand All @@ -100,6 +104,7 @@ jobs:
path: src
ref: ${{ inputs.build_ref || github.sha }}
cache_path: "/__w/repo_cache/"
merge: ${{ inputs.merge }}
- name: Configure
env:
CC: ${{ inputs.cc }}
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/sycl_nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ jobs:
build_cache_root: "/__w/"
build_artifact_suffix: default-2204
build_configure_extra_args: '--hip --cuda --enable-esimd-emulator'
merge: false

ubuntu2204_opaque_pointers_build_test:
if: github.repository == 'intel/llvm'
Expand All @@ -37,6 +38,7 @@ jobs:
build_cache_suffix: opaque_pointers
build_artifact_suffix: opaque_pointers-2204
build_configure_extra_args: "--hip --cuda --enable-esimd-emulator --cmake-opt=-DSPIRV_ENABLE_OPAQUE_POINTERS=TRUE"
merge: false

windows_default:
name: Windows
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/sycl_post_commit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ jobs:
lts_matrix: ${{ needs.test_matrix.outputs.lts_lx_matrix }}
cts_matrix: ${{ needs.test_matrix.outputs.cts_matrix }}
lts_aws_matrix: ${{ needs.test_matrix.outputs.lts_aws_matrix }}
merge: false

windows_default:
name: Windows
Expand Down