Skip to content

Commit 8bda176

Browse files
committed
Switch to the latest images for the CI tests.
This required adding some code for downloading the externals from the appropriate Acts tar file.
1 parent 7125977 commit 8bda176

File tree

2 files changed

+22
-16
lines changed

2 files changed

+22
-16
lines changed

.github/ci_setup.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export CTEST_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL}
1919
export MAKEFLAGS="-j${CMAKE_BUILD_PARALLEL_LEVEL}"
2020

2121
# Set up the correct environment for the SYCL tests.
22-
if [ "${PLATFORM_NAME}" = "SYCL" ]; then
22+
if [[ "${PLATFORM_NAME}" == *"SYCL"* ]]; then
2323
if [ -f "/opt/intel/oneapi/setvars.sh" ]; then
2424
OLD_CPATH=${CPATH}
2525
source /opt/intel/oneapi/setvars.sh --include-intel-llvm

.github/workflows/builds.yml

+21-15
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,23 @@ jobs:
2525
matrix:
2626
platform:
2727
- name: CPU
28-
container: ghcr.io/acts-project/ubuntu2404:56
28+
container: ghcr.io/acts-project/ubuntu2404:69
2929
options: --preset host-fp32 -DALGEBRA_PLUGINS_USE_SYSTEM_VC=FALSE
3030
run_tests: true
3131
- name: CPU
32-
container: ghcr.io/acts-project/ubuntu2404:56
32+
container: ghcr.io/acts-project/ubuntu2404:69
3333
options: --preset host-fp64 -DALGEBRA_PLUGINS_USE_SYSTEM_VC=FALSE
3434
run_tests: false
3535
- name: CUDA
36-
container: ghcr.io/acts-project/ubuntu2404_cuda:56
36+
container: ghcr.io/acts-project/ubuntu2404_cuda:69
3737
options: --preset cuda-fp32
3838
run_tests: false
39-
- name: SYCL
40-
container: ghcr.io/acts-project/ubuntu2404_oneapi:56
41-
options: --preset sycl-fp32 -DCMAKE_SYCL_FLAGS="-fsycl -fsycl-targets=spir64"
39+
- name: "SYCL Intel"
40+
container: ghcr.io/acts-project/ubuntu2404_oneapi:69
41+
options: --preset sycl-fp32
4242
run_tests: true
4343
- name: KOKKOS
44-
container: ghcr.io/acts-project/ubuntu2404:56
44+
container: ghcr.io/acts-project/ubuntu2404:69
4545
options: --preset kokkos-fp32
4646
run_tests: false
4747
build:
@@ -50,31 +50,31 @@ jobs:
5050
include:
5151
- platform:
5252
name: CUDA
53-
container: ghcr.io/acts-project/ubuntu2404_cuda:56
53+
container: ghcr.io/acts-project/ubuntu2404_cuda:69
5454
options: --preset cuda-fp64
5555
run_tests: false
5656
build: Release
5757
- platform:
58-
name: "SYCL"
59-
container: ghcr.io/acts-project/ubuntu2404_cuda_oneapi:56
58+
name: "SYCL NVIDIA"
59+
container: ghcr.io/acts-project/ubuntu2404_cuda_oneapi:69
6060
options: --preset sycl-fp32
6161
run_tests: false
6262
build: Release
6363
- platform:
64-
name: "SYCL"
65-
container: ghcr.io/acts-project/ubuntu2404_rocm_oneapi:56
64+
name: "SYCL AMD"
65+
container: ghcr.io/acts-project/ubuntu2404_rocm_oneapi:69
6666
options: --preset sycl-fp32
6767
run_tests: false
6868
build: Release
6969
- platform:
7070
name: ALPAKA
71-
container: ghcr.io/acts-project/ubuntu2404:56
71+
container: ghcr.io/acts-project/ubuntu2404:69
7272
options: --preset alpaka-fp32
7373
run_tests: true
7474
build: Release
7575
- platform:
7676
name: ALPAKA
77-
container: ghcr.io/acts-project/ubuntu2404:56
77+
container: ghcr.io/acts-project/ubuntu2404:69
7878
options: --preset alpaka-fp32
7979
run_tests: false
8080
build: Debug
@@ -83,7 +83,13 @@ jobs:
8383
run:
8484
shell: bash
8585
steps:
86-
- uses: actions/checkout@v3
86+
- uses: actions/checkout@v4
87+
- name: Install dependencies
88+
run: |
89+
apt install -y zstd
90+
curl --retry 5 --retry-delay 10 --output deps.tar.zst https://acts.web.cern.ch/ACTS/ci/ubuntu-24.04/deps.v6.tar.zst
91+
tar -xf deps.tar.zst -C /usr/local --strip-components=1
92+
rm deps.tar.zst
8793
- name: Configure
8894
run: |
8995
source ${GITHUB_WORKSPACE}/.github/ci_setup.sh ${{ matrix.platform.name }}

0 commit comments

Comments
 (0)