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

This is likely not perfect but should work for now. Longer term we need
to be more explicit about both checkout ref and base branch ref for the
merge to fix another race condition with E2E tests. Not target of this
PR though.

Author: aelovikov-intel

.github/workflows/sycl_linux_build_and_test.yml

@@ -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:
@@ -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 }}

.github/workflows/sycl_nightly.yml

@@ -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'
@@ -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

.github/workflows/sycl_post_commit.yml

@@ -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