Skip to content

Commit 311fdc4

Browse files
authored
[CI] Use devops dir from sycl on sycl-rel nightly (#17004)
To keep sycl-rel nightly testing up to date we need to use devops/actions from sycl branch. This change adds new input to specify the ref for devops dir checkout. #16816 (comment)
1 parent 2889aa4 commit 311fdc4

File tree

4 files changed

+26
-3
lines changed

4 files changed

+26
-3
lines changed

.github/workflows/sycl-linux-run-tests.yml

+11-1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,16 @@ on:
3838
ref:
3939
type: string
4040
required: True
41+
devops_ref:
42+
type: string
43+
required: False
44+
description: |
45+
By default we checkout the devops directory from "inputs.ref" branch.
46+
devops_ref may be specified to checkout the devops dir from different
47+
branch.
48+
Note: it doesn't affect ./devops/actions/run-tests/* as these actions
49+
call checkout again and therefore override the devops directory, so
50+
configs/dependecies from input.ref are used.
4151
4252
sycl_toolchain_artifact:
4353
type: string
@@ -197,7 +207,7 @@ jobs:
197207
sudo bash -c 'echo 1 > /sys/kernel/debug/dri/0/i915_wedged'
198208
- uses: actions/checkout@v4
199209
with:
200-
ref: ${{ inputs.ref }}
210+
ref: ${{ inputs.devops_ref || inputs.ref }}
201211
sparse-checkout: |
202212
devops
203213
- name: Register cleanup after job is finished

.github/workflows/sycl-rel-nightly.yml

+4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ jobs:
1212
# since the last run. More precisely, it checks if the last commit is older
1313
# than 24h. That means the previous Nightly already tested this commit.
1414
check_for_new_commits:
15+
if: github.repository == 'intel/llvm'
1516
runs-on: ubuntu-latest
1617
name: Check for new commits
1718
outputs:
@@ -101,6 +102,7 @@ jobs:
101102
extra_lit_opts: ${{ matrix.extra_lit_opts }}
102103
reset_intel_gpu: ${{ matrix.reset_intel_gpu }}
103104
ref: sycl-rel-6_0_0
105+
devops_ref: sycl
104106
sycl_toolchain_artifact: sycl_linux_default
105107
sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}
106108
sycl_toolchain_decompress_command: ${{ needs.ubuntu2204_build.outputs.artifact_decompress_command }}
@@ -130,6 +132,7 @@ jobs:
130132
sycl_toolchain_archive: ${{ needs.build-win.outputs.artifact_archive_name }}
131133
extra_lit_opts: --param gpu-intel-gen12=True
132134
ref: sycl-rel-6_0_0
135+
devops_ref: sycl
133136

134137
cuda-aws-start:
135138
needs: [ubuntu2204_build]
@@ -151,6 +154,7 @@ jobs:
151154
image_options: -u 1001 --gpus all --cap-add SYS_ADMIN --env NVIDIA_DISABLE_REQUIRE=1
152155
target_devices: cuda:gpu
153156
ref: sycl-rel-6_0_0
157+
devops_ref: sycl
154158

155159
sycl_toolchain_artifact: sycl_linux_default
156160
sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}

.github/workflows/sycl-windows-build.yml

-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ jobs:
9090
with:
9191
sparse-checkout: |
9292
devops/actions
93-
ref: ${{ inputs.ref || github.sha }}
9493
- uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756
9594
with:
9695
arch: amd64

.github/workflows/sycl-windows-run-tests.yml

+11-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,16 @@ on:
1818
ref:
1919
type: string
2020
required: False
21+
devops_ref:
22+
type: string
23+
required: False
24+
description: |
25+
By default we checkout the devops directory from "inputs.ref" branch.
26+
devops_ref may be specified to checkout the devops dir from different
27+
branch.
28+
Note: it doesn't affect ./devops/actions/run-tests/* as these actions
29+
call checkout again and therefore override the devops directory, so
30+
configs/dependecies from input.ref are used.
2131
2232
sycl_toolchain_artifact:
2333
type: string
@@ -61,7 +71,7 @@ jobs:
6171
with:
6272
sparse-checkout: |
6373
devops/actions
64-
ref: ${{ inputs.ref || github.sha }}
74+
ref: ${{ inputs.devops_ref|| inputs.ref || github.sha }}
6575
- uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756
6676
with:
6777
arch: amd64

0 commit comments

Comments
 (0)