Skip to content

Commit f566c4e

Browse files
author
Colin Davidson
committed
Update to use smaller docker with a few extra installs
The docker is being shrunk slightly - see #852. This means we need a few extra installs such as clang-tidy as needed.
1 parent 4e4811a commit f566c4e

3 files changed

Lines changed: 49 additions & 42 deletions

File tree

‎.github/workflows/pr_tests_cache.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
if: github.repository == 'uxlfoundation/oneapi-construction-kit' || github.event_name != 'schedule'
3434
runs-on: ubuntu-22.04
3535
container:
36-
image: ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest
36+
image: ghcr.io/coldav/ock_ubuntu_22.04-x86-64:latest
3737
volumes:
3838
- ${{github.workspace}}:${{github.workspace}}
3939
steps:
@@ -63,7 +63,7 @@ jobs:
6363
needs: [ubuntu_22_llvm_prev_jobs]
6464
runs-on: ubuntu-22.04
6565
container:
66-
image: ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest
66+
image: ghcr.io/coldav/ock_ubuntu_22.04-x86-64:latest
6767
volumes:
6868
- ${{github.workspace}}:${{github.workspace}}
6969
steps:
@@ -109,7 +109,7 @@ jobs:
109109
needs: [ubuntu_22_llvm_current_jobs]
110110
runs-on: ubuntu-22.04-arm
111111
container:
112-
image: ghcr.io/uxlfoundation/ock_ubuntu_22.04-aarch64:latest
112+
image: ghcr.io/coldav/ock_ubuntu_22.04-aarch64:latest
113113
volumes:
114114
- ${{github.workspace}}:${{github.workspace}}
115115
steps:

‎.github/workflows/run_ock_external_tests.yml‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,9 @@ jobs:
152152
# build llvm. Otherwise we choose ubuntu-22.04 (use a container for both for consistency).
153153
runs-on: ${{ contains(matrix.target, 'host_aarch64') && 'ubuntu-22.04-arm' || (contains(matrix.target, 'host_riscv64') && 'ubuntu-24.04' || 'ubuntu-22.04') }}
154154
container:
155-
image: ${{ contains(matrix.target, 'host_riscv') && 'ghcr.io/uxlfoundation/ock_ubuntu_24.04-x86-64:latest'
156-
|| ( contains(matrix.target, 'host_aarch64') && 'ghcr.io/uxlfoundation/ock_ubuntu_22.04-aarch64:latest'
157-
|| 'ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest' ) }}
155+
image: ${{ contains(matrix.target, 'host_riscv') && 'ghcr.io/coldav/ock_ubuntu_24.04-x86-64:latest'
156+
|| ( contains(matrix.target, 'host_aarch64') && 'ghcr.io/coldav/ock_ubuntu_22.04-aarch64:latest'
157+
|| 'ghcr.io/coldav/ock_ubuntu_22.04-x86-64:latest' ) }}
158158
volumes:
159159
- ${{github.workspace}}:${{github.workspace}}
160160
if: inputs.ock && contains(inputs.target_list, 'linux')
@@ -184,9 +184,9 @@ jobs:
184184

185185
runs-on: ${{ contains(matrix.target, 'host_aarch64') && 'ubuntu-22.04-arm' || (contains(matrix.target, 'host_riscv64') && 'ubuntu-24.04' || 'ubuntu-22.04') }}
186186
container:
187-
image: ${{ contains(matrix.target, 'host_riscv') && 'ghcr.io/uxlfoundation/ock_ubuntu_24.04-x86-64:latest'
188-
|| ( contains(matrix.target, 'host_aarch64') && 'ghcr.io/uxlfoundation/ock_ubuntu_22.04-aarch64:latest'
189-
|| 'ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest' ) }}
187+
image: ${{ contains(matrix.target, 'host_riscv') && 'ghcr.io/coldav/ock_ubuntu_24.04-x86-64:latest'
188+
|| ( contains(matrix.target, 'host_aarch64') && 'ghcr.io/coldav/ock_ubuntu_22.04-aarch64:latest'
189+
|| 'ghcr.io/coldav/ock_ubuntu_22.04-x86-64:latest' ) }}
190190
volumes:
191191
- ${{github.workspace}}:${{github.workspace}}
192192
steps:
@@ -241,9 +241,9 @@ jobs:
241241

242242
runs-on: ${{ contains(matrix.target, 'host_aarch64') && 'ubuntu-22.04-arm' || (contains(matrix.target, 'host_riscv64') && 'cp-ubuntu-24.04' || 'ubuntu-22.04') }}
243243
container:
244-
image: ${{ contains(matrix.target, 'host_riscv') && 'ghcr.io/uxlfoundation/ock_ubuntu_24.04-x86-64:latest'
245-
|| ( contains(matrix.target, 'host_aarch64') && 'ghcr.io/uxlfoundation/ock_ubuntu_22.04-aarch64:latest'
246-
|| 'ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest' ) }}
244+
image: ${{ contains(matrix.target, 'host_riscv') && 'ghcr.io/coldav/ock_ubuntu_24.04-x86-64:latest'
245+
|| ( contains(matrix.target, 'host_aarch64') && 'ghcr.io/coldav/ock_ubuntu_22.04-aarch64:latest'
246+
|| 'ghcr.io/coldav/ock_ubuntu_22.04-x86-64:latest' ) }}
247247
volumes:
248248
- ${{github.workspace}}:${{github.workspace}}
249249
steps:
@@ -273,7 +273,7 @@ jobs:
273273
needs: [workflow_vars]
274274
runs-on: 'ubuntu-22.04'
275275
container:
276-
image: 'ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest'
276+
image: 'ghcr.io/coldav/ock_ubuntu_22.04-x86-64:latest'
277277
volumes:
278278
- ${{github.workspace}}:${{github.workspace}}
279279

@@ -296,7 +296,7 @@ jobs:
296296
needs: [workflow_vars]
297297
runs-on: 'ubuntu-22.04-arm'
298298
container:
299-
image: 'ghcr.io/uxlfoundation/ock_ubuntu_22.04-aarch64:latest'
299+
image: 'ghcr.io/coldav/ock_ubuntu_22.04-aarch64:latest'
300300
volumes:
301301
- ${{github.workspace}}:${{github.workspace}}
302302

@@ -325,7 +325,7 @@ jobs:
325325

326326
runs-on: ubuntu-24.04
327327
container:
328-
image: 'ghcr.io/uxlfoundation/ock_ubuntu_24.04-x86-64:latest'
328+
image: 'ghcr.io/coldav/ock_ubuntu_24.04-x86-64:latest'
329329
volumes:
330330
- ${{github.workspace}}:${{github.workspace}}
331331

@@ -352,7 +352,7 @@ jobs:
352352
subset: [ 'A', 'B', 'C' ]
353353
runs-on: 'ubuntu-24.04'
354354
container:
355-
image: 'ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest'
355+
image: 'ghcr.io/coldav/ock_ubuntu_22.04-x86-64:latest'
356356
volumes:
357357
- ${{github.workspace}}:${{github.workspace}}
358358

@@ -397,7 +397,7 @@ jobs:
397397
subset: [ 'A', 'B', 'C' ]
398398
runs-on: 'ubuntu-24.04'
399399
container:
400-
image: 'ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest'
400+
image: 'ghcr.io/coldav/ock_ubuntu_22.04-x86-64:latest'
401401
volumes:
402402
- ${{github.workspace}}:${{github.workspace}}
403403

@@ -442,7 +442,7 @@ jobs:
442442
subset: [ 'A', 'B', 'C' ]
443443
runs-on: 'ubuntu-22.04-arm'
444444
container:
445-
image: 'ghcr.io/uxlfoundation/ock_ubuntu_22.04-aarch64:latest'
445+
image: 'ghcr.io/coldav/ock_ubuntu_22.04-aarch64:latest'
446446
volumes:
447447
- ${{github.workspace}}:${{github.workspace}}
448448

@@ -487,7 +487,7 @@ jobs:
487487
subset: [ 'A', 'B', 'C' ]
488488
runs-on: 'ubuntu-22.04-arm'
489489
container:
490-
image: 'ghcr.io/uxlfoundation/ock_ubuntu_22.04-aarch64:latest'
490+
image: 'ghcr.io/coldav/ock_ubuntu_22.04-aarch64:latest'
491491
volumes:
492492
- ${{github.workspace}}:${{github.workspace}}
493493

@@ -532,7 +532,7 @@ jobs:
532532
subset: [ 'A', 'B', 'C' ]
533533
runs-on: 'ubuntu-24.04'
534534
container:
535-
image: 'ghcr.io/uxlfoundation/ock_ubuntu_24.04-x86-64:latest'
535+
image: 'ghcr.io/coldav/ock_ubuntu_24.04-x86-64:latest'
536536
volumes:
537537
- ${{github.workspace}}:${{github.workspace}}
538538

@@ -577,7 +577,7 @@ jobs:
577577
subset: [ 'A', 'B', 'C' ]
578578
runs-on: 'ubuntu-24.04'
579579
container:
580-
image: 'ghcr.io/uxlfoundation/ock_ubuntu_24.04-x86-64:latest'
580+
image: 'ghcr.io/coldav/ock_ubuntu_24.04-x86-64:latest'
581581
volumes:
582582
- ${{github.workspace}}:${{github.workspace}}
583583

@@ -618,7 +618,7 @@ jobs:
618618
needs: [workflow_vars, create_ock_artefacts_ubuntu, build_dpcpp_native_x86_64, build_sycl_cts_x86_64_opencl_combine]
619619
runs-on: 'ubuntu-22.04'
620620
container:
621-
image: 'ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest'
621+
image: 'ghcr.io/coldav/ock_ubuntu_22.04-x86-64:latest'
622622
volumes:
623623
- ${{github.workspace}}:${{github.workspace}}
624624

@@ -637,7 +637,7 @@ jobs:
637637
needs: [workflow_vars, build_dpcpp_native_x86_64, build_sycl_cts_x86_64_native_cpu_combine]
638638
runs-on: 'ubuntu-22.04'
639639
container:
640-
image: 'ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest'
640+
image: 'ghcr.io/coldav/ock_ubuntu_22.04-x86-64:latest'
641641
volumes:
642642
- ${{github.workspace}}:${{github.workspace}}
643643

@@ -656,7 +656,7 @@ jobs:
656656
needs: [workflow_vars, create_ock_artefacts_ubuntu, build_dpcpp_native_aarch64, build_sycl_cts_aarch64_opencl_combine]
657657
runs-on: 'ubuntu-22.04-arm'
658658
container:
659-
image: 'ghcr.io/uxlfoundation/ock_ubuntu_22.04-aarch64:latest'
659+
image: 'ghcr.io/coldav/ock_ubuntu_22.04-aarch64:latest'
660660
volumes:
661661
- ${{github.workspace}}:${{github.workspace}}
662662

@@ -675,7 +675,7 @@ jobs:
675675
needs: [workflow_vars, build_dpcpp_native_aarch64, build_sycl_cts_aarch64_native_cpu_combine]
676676
runs-on: 'ubuntu-22.04-arm'
677677
container:
678-
image: 'ghcr.io/uxlfoundation/ock_ubuntu_22.04-aarch64:latest'
678+
image: 'ghcr.io/coldav/ock_ubuntu_22.04-aarch64:latest'
679679
volumes:
680680
- ${{github.workspace}}:${{github.workspace}}
681681

@@ -694,7 +694,7 @@ jobs:
694694
needs: [workflow_vars, create_ock_artefacts_ubuntu, build_dpcpp_native_x86_64, build_dpcpp_riscv64, build_sycl_cts_riscv64_opencl_combine]
695695
runs-on: 'cp-ubuntu-24.04' # note: the job will time-out (>6 hrs) if default github runners are used
696696
container:
697-
image: 'ghcr.io/uxlfoundation/ock_ubuntu_24.04-x86-64:latest'
697+
image: 'ghcr.io/coldav/ock_ubuntu_24.04-x86-64:latest'
698698
volumes:
699699
- ${{github.workspace}}:${{github.workspace}}
700700

@@ -713,7 +713,7 @@ jobs:
713713
needs: [workflow_vars, build_dpcpp_native_x86_64, build_dpcpp_riscv64, build_sycl_cts_riscv64_native_cpu_combine]
714714
runs-on: 'ubuntu-24.04'
715715
container:
716-
image: 'ghcr.io/uxlfoundation/ock_ubuntu_24.04-x86-64:latest'
716+
image: 'ghcr.io/coldav/ock_ubuntu_24.04-x86-64:latest'
717717
volumes:
718718
- ${{github.workspace}}:${{github.workspace}}
719719

@@ -732,7 +732,7 @@ jobs:
732732
needs: [workflow_vars, build_dpcpp_native_x86_64]
733733
runs-on: 'ubuntu-22.04'
734734
container:
735-
image: 'ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest'
735+
image: 'ghcr.io/coldav/ock_ubuntu_22.04-x86-64:latest'
736736
volumes:
737737
- ${{github.workspace}}:${{github.workspace}}
738738

@@ -750,7 +750,7 @@ jobs:
750750
needs: [workflow_vars, build_dpcpp_native_x86_64]
751751
runs-on: 'ubuntu-22.04'
752752
container:
753-
image: 'ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest'
753+
image: 'ghcr.io/coldav/ock_ubuntu_22.04-x86-64:latest'
754754
volumes:
755755
- ${{github.workspace}}:${{github.workspace}}
756756

‎.github/workflows/run_ock_internal_tests.yml‎

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
if: contains(inputs.target_list, 'host_x86_64_linux')
6666
runs-on: ubuntu-22.04
6767
container:
68-
image: ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest
68+
image: ghcr.io/coldav/ock_ubuntu_22.04-x86-64:latest
6969
volumes:
7070
- ${{github.workspace}}:${{github.workspace}}
7171
steps:
@@ -100,7 +100,7 @@ jobs:
100100
if: contains(inputs.target_list, 'host_x86_64_linux')
101101
runs-on: ubuntu-22.04
102102
container:
103-
image: ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest
103+
image: ghcr.io/coldav/ock_ubuntu_22.04-x86-64:latest
104104
volumes:
105105
- ${{github.workspace}}:${{github.workspace}}
106106
steps:
@@ -114,6 +114,13 @@ jobs:
114114
llvm_version: ${{ inputs.llvm_current }}
115115
llvm_source: ${{ inputs.llvm_source}}
116116
github_token: ${{ secrets.GITHUB_TOKEN }}
117+
118+
# Install requirements
119+
- name: Install clang-tidy and parallel
120+
run: |
121+
sudo apt-get update
122+
sudo apt-get install --yes clang-tidy-19 parallel
123+
117124
- name: build initial config files
118125
uses: ./.github/actions/do_build_ock
119126
with:
@@ -193,7 +200,7 @@ jobs:
193200
if: contains(inputs.target_list, 'host_refsi_linux')
194201
runs-on: ubuntu-22.04
195202
container:
196-
image: ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest
203+
image: ghcr.io/coldav/ock_ubuntu_22.04-x86-64:latest
197204
volumes:
198205
- ${{github.workspace}}:${{github.workspace}}
199206
timeout-minutes: 60
@@ -215,7 +222,7 @@ jobs:
215222
if: ${{ !inputs.is_pull_request && contains(inputs.target_list, 'host_i686_linux') }}
216223
runs-on: ubuntu-22.04
217224
container:
218-
image: ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest
225+
image: ghcr.io/coldav/ock_ubuntu_22.04-x86-64:latest
219226
volumes:
220227
- ${{github.workspace}}:${{github.workspace}}
221228
timeout-minutes: 90 # offline needs longer timeout
@@ -237,7 +244,7 @@ jobs:
237244
if: contains(inputs.target_list, 'host_refsi_linux')
238245
runs-on: ubuntu-22.04
239246
container:
240-
image: ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest
247+
image: ghcr.io/coldav/ock_ubuntu_22.04-x86-64:latest
241248
volumes:
242249
- ${{github.workspace}}:${{github.workspace}}
243250
timeout-minutes: 60
@@ -258,7 +265,7 @@ jobs:
258265
if: contains(inputs.target_list, 'host_riscv64_linux')
259266
runs-on: ubuntu-22.04
260267
container:
261-
image: ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest
268+
image: ghcr.io/coldav/ock_ubuntu_22.04-x86-64:latest
262269
volumes:
263270
- ${{github.workspace}}:${{github.workspace}}
264271
timeout-minutes: 60
@@ -280,7 +287,7 @@ jobs:
280287
if: contains(inputs.target_list, 'host_riscv64_linux')
281288
runs-on: ubuntu-22.04
282289
container:
283-
image: ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest
290+
image: ghcr.io/coldav/ock_ubuntu_22.04-x86-64:latest
284291
volumes:
285292
- ${{github.workspace}}:${{github.workspace}}
286293
timeout-minutes: 60
@@ -305,7 +312,7 @@ jobs:
305312
if: contains(inputs.target_list, 'host_i686_linux')
306313
runs-on: ubuntu-22.04
307314
container:
308-
image: ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest
315+
image: ghcr.io/coldav/ock_ubuntu_22.04-x86-64:latest
309316
volumes:
310317
- ${{github.workspace}}:${{github.workspace}}
311318
timeout-minutes: 60
@@ -326,7 +333,7 @@ jobs:
326333
if: contains(inputs.target_list, 'host_aarch64_linux')
327334
runs-on: ubuntu-22.04-arm
328335
container:
329-
image: ghcr.io/uxlfoundation/ock_ubuntu_22.04-aarch64:latest
336+
image: ghcr.io/coldav/ock_ubuntu_22.04-aarch64:latest
330337
volumes:
331338
- ${{github.workspace}}:${{github.workspace}}
332339
timeout-minutes: 90 # aarch64 needs longer timeout
@@ -348,7 +355,7 @@ jobs:
348355
if: contains(inputs.target_list, 'host_refsi_linux')
349356
runs-on: ubuntu-22.04
350357
container:
351-
image: ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest
358+
image: ghcr.io/coldav/ock_ubuntu_22.04-x86-64:latest
352359
volumes:
353360
- ${{github.workspace}}:${{github.workspace}}
354361
timeout-minutes: 60
@@ -373,7 +380,7 @@ jobs:
373380
if: ${{ !inputs.is_pull_request && contains(inputs.target_list, 'host_refsi_linux') }}
374381
runs-on: ubuntu-22.04
375382
container:
376-
image: ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest
383+
image: ghcr.io/coldav/ock_ubuntu_22.04-x86-64:latest
377384
volumes:
378385
- ${{github.workspace}}:${{github.workspace}}
379386
timeout-minutes: 60
@@ -399,7 +406,7 @@ jobs:
399406
if: contains(inputs.target_list, 'host_refsi_linux')
400407
runs-on: ubuntu-22.04
401408
container:
402-
image: ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest
409+
image: ghcr.io/coldav/ock_ubuntu_22.04-x86-64:latest
403410
volumes:
404411
- ${{github.workspace}}:${{github.workspace}}
405412
timeout-minutes: 60
@@ -420,7 +427,7 @@ jobs:
420427
if: contains(inputs.target_list, 'host_refsi_linux')
421428
runs-on: ubuntu-22.04
422429
container:
423-
image: ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest
430+
image: ghcr.io/coldav/ock_ubuntu_22.04-x86-64:latest
424431
volumes:
425432
- ${{github.workspace}}:${{github.workspace}}
426433
timeout-minutes: 60

0 commit comments

Comments
 (0)