diff --git a/.github/workflows/sycl-linux-run-tests.yml b/.github/workflows/sycl-linux-run-tests.yml index 6e9e85d04fd03..7a4dd382e8bca 100644 --- a/.github/workflows/sycl-linux-run-tests.yml +++ b/.github/workflows/sycl-linux-run-tests.yml @@ -38,6 +38,16 @@ on: ref: type: string required: True + devops_ref: + type: string + required: False + description: | + By default we checkout the devops directory from "inputs.ref" branch. + devops_ref may be specified to checkout the devops dir from different + branch. + Note: it doesn't affect ./devops/actions/run-tests/* as these actions + call checkout again and therefore override the devops directory, so + configs/dependecies from input.ref are used. sycl_toolchain_artifact: type: string @@ -197,7 +207,7 @@ jobs: sudo bash -c 'echo 1 > /sys/kernel/debug/dri/0/i915_wedged' - uses: actions/checkout@v4 with: - ref: ${{ inputs.ref }} + ref: ${{ inputs.devops_ref || inputs.ref }} sparse-checkout: | devops - name: Register cleanup after job is finished diff --git a/.github/workflows/sycl-rel-nightly.yml b/.github/workflows/sycl-rel-nightly.yml index cbe99c647bb2d..9e196b8b51d66 100644 --- a/.github/workflows/sycl-rel-nightly.yml +++ b/.github/workflows/sycl-rel-nightly.yml @@ -12,6 +12,7 @@ jobs: # since the last run. More precisely, it checks if the last commit is older # than 24h. That means the previous Nightly already tested this commit. check_for_new_commits: + if: github.repository == 'intel/llvm' runs-on: ubuntu-latest name: Check for new commits outputs: @@ -101,6 +102,7 @@ jobs: extra_lit_opts: ${{ matrix.extra_lit_opts }} reset_intel_gpu: ${{ matrix.reset_intel_gpu }} ref: sycl-rel-6_0_0 + devops_ref: sycl sycl_toolchain_artifact: sycl_linux_default sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }} sycl_toolchain_decompress_command: ${{ needs.ubuntu2204_build.outputs.artifact_decompress_command }} @@ -130,6 +132,7 @@ jobs: sycl_toolchain_archive: ${{ needs.build-win.outputs.artifact_archive_name }} extra_lit_opts: --param gpu-intel-gen12=True ref: sycl-rel-6_0_0 + devops_ref: sycl cuda-aws-start: needs: [ubuntu2204_build] @@ -151,6 +154,7 @@ jobs: image_options: -u 1001 --gpus all --cap-add SYS_ADMIN --env NVIDIA_DISABLE_REQUIRE=1 target_devices: cuda:gpu ref: sycl-rel-6_0_0 + devops_ref: sycl sycl_toolchain_artifact: sycl_linux_default sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }} diff --git a/.github/workflows/sycl-windows-build.yml b/.github/workflows/sycl-windows-build.yml index 973d9dae7dda4..ee8229def53c0 100644 --- a/.github/workflows/sycl-windows-build.yml +++ b/.github/workflows/sycl-windows-build.yml @@ -90,7 +90,6 @@ jobs: with: sparse-checkout: | devops/actions - ref: ${{ inputs.ref || github.sha }} - uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 with: arch: amd64 diff --git a/.github/workflows/sycl-windows-run-tests.yml b/.github/workflows/sycl-windows-run-tests.yml index a25803236be7d..6b26a23b3db5f 100644 --- a/.github/workflows/sycl-windows-run-tests.yml +++ b/.github/workflows/sycl-windows-run-tests.yml @@ -18,6 +18,16 @@ on: ref: type: string required: False + devops_ref: + type: string + required: False + description: | + By default we checkout the devops directory from "inputs.ref" branch. + devops_ref may be specified to checkout the devops dir from different + branch. + Note: it doesn't affect ./devops/actions/run-tests/* as these actions + call checkout again and therefore override the devops directory, so + configs/dependecies from input.ref are used. sycl_toolchain_artifact: type: string @@ -61,7 +71,7 @@ jobs: with: sparse-checkout: | devops/actions - ref: ${{ inputs.ref || github.sha }} + ref: ${{ inputs.devops_ref|| inputs.ref || github.sha }} - uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 with: arch: amd64