Skip to content

Commit 01ef856

Browse files
committed
ci: update dependencies
* move to rhel 8.10 * move to sles 15.6 * require c++20 * update boost to 1.76 Signed-off-by: Kozlowski, Marek <[email protected]>
1 parent 7e1fe2b commit 01ef856

File tree

6 files changed

+74
-13
lines changed

6 files changed

+74
-13
lines changed

.github/docker/rhel.Dockerfile

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,21 @@
33
ARG VMAJ
44
ARG VMIN
55
FROM ghcr.io/oneapi-src/level-zero-linux-compute/rhel:${VMAJ}.${VMIN}
6+
7+
RUN <<EOF
8+
git clone --recurse-submodules --branch boost-1.76.0 https://github.com/boostorg/boost.git
9+
cd boost
10+
./bootstrap.sh
11+
./b2 install \
12+
-j 4 \
13+
address-model=64 \
14+
--with-chrono \
15+
--with-log \
16+
--with-program_options \
17+
--with-serialization \
18+
--with-system \
19+
--with-timer \
20+
--with-date_time
21+
cd ..
22+
rm -rf boost
23+
EOF

.github/docker/sles.Dockerfile

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,29 @@ FROM ghcr.io/oneapi-src/level-zero-linux-compute/sles:${VMAJ}.${VMIN}
66

77
SHELL ["/bin/bash", "-e", "-c"]
88

9+
ARG VMAJ
10+
ARG VMIN
11+
12+
RUN <<EOF
13+
if [ "$VMIN" = "4" ]; then
14+
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 120 \
15+
--slave /usr/bin/g++ g++ /usr/bin/g++-11
16+
update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++-11 120
17+
update-alternatives --install /usr/bin/cc cc /usr/bin/gcc-11 120
18+
elif [ "$VMIN" = "6" ]; then
19+
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 120 \
20+
--slave /usr/bin/g++ g++ /usr/bin/g++-13
21+
update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++-13 120
22+
update-alternatives --install /usr/bin/cc cc /usr/bin/gcc-13 120
23+
fi
24+
update-alternatives --config gcc
25+
update-alternatives --config c++
26+
update-alternatives --config cc
27+
EOF
28+
929
# Static libraries for boost are not part of the SLES distribution
1030
RUN <<EOF
11-
git clone --recurse-submodules --branch boost-1.70.0 https://github.com/boostorg/boost.git
31+
git clone --recurse-submodules --branch boost-1.76.0 https://github.com/boostorg/boost.git
1232
cd boost
1333
./bootstrap.sh
1434
./b2 install \
@@ -19,7 +39,8 @@ cd boost
1939
--with-program_options \
2040
--with-serialization \
2141
--with-system \
42+
--with-date_time \
2243
--with-timer
2344
cd ..
2445
rm -rf boost
25-
EOF
46+
EOF

.github/docker/ubuntu.Dockerfile

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ apt-get install -o Dpkg::Options::="--force-overwrite" -y \
2323
file \
2424
git \
2525
ninja-build \
26-
libboost-all-dev \
2726
libpapi-dev \
2827
libpng-dev \
2928
libva-dev \
@@ -33,3 +32,25 @@ apt-get install -o Dpkg::Options::="--force-overwrite" -y \
3332
python3-pip
3433
rm -rf /var/lib/apt/lists/*
3534
EOF
35+
36+
37+
ENV BOOST_BUILD_PATH=/boost_1_76_0
38+
ADD https://archives.boost.io/release/1.76.0/source/boost_1_76_0.tar.gz /boost_1_76_0.tar.gz
39+
RUN <<EOF
40+
tar xf /boost_1_76_0.tar.gz
41+
rm /boost_1_76_0.tar.gz
42+
cd /boost_1_76_0
43+
./bootstrap.sh
44+
./b2 install \
45+
-j $(nproc) \
46+
link=static \
47+
address-model=64 \
48+
--with-chrono \
49+
--with-log \
50+
--with-program_options \
51+
--with-regex \
52+
--with-serialization \
53+
--with-system \
54+
--with-timer
55+
rm -rf /boost_1_76_0
56+
EOF

.github/docker/windows.Dockerfile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,16 +90,17 @@ cd ../.. && `
9090
rm -rf OpenCL-ICD-Loader-2024.10.24"
9191

9292
RUN "`
93-
curl -OSL --ssl-no-revoke https://archives.boost.io/release/1.73.0/source/boost_1_73_0.7z && `
94-
7z.exe x boost_1_73_0.7z && `
95-
cd boost_1_73_0 && `
93+
curl -OSL --ssl-no-revoke https://archives.boost.io/release/1.76.0/source/boost_1_76_0.7z && `
94+
7z.exe x boost_1_76_0.7z && `
95+
cd boost_1_76_0 && `
9696
MSYS_NO_PATHCONV=1 cmd /c bootstrap.bat && `
9797
./b2.exe install -j 16 address-model=64 `
9898
--with-chrono `
9999
--with-log `
100100
--with-program_options `
101101
--with-serialization `
102102
--with-system `
103+
--with-date_time `
103104
--with-timer && `
104105
cd .. && `
105-
rm -rf boost_1_73_0"
106+
rm -rf boost_1_76_0"

.github/workflows/build-multi.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,10 +137,9 @@ jobs:
137137
{name: ubuntu, vmaj: 22, vmin: '04'},
138138
{name: ubuntu, vmaj: 24, vmin: '04'},
139139
{name: ubuntu, vmaj: 24, vmin: '10'},
140-
{name: sles, vmaj: 15, vmin: 2},
141-
{name: sles, vmaj: 15, vmin: 3},
142140
{name: sles, vmaj: 15, vmin: 4},
143-
{name: rhel, vmaj: 8, vmin: 6},
141+
{name: sles, vmaj: 15, vmin: 6},
142+
{name: rhel, vmaj: 8, vmin: 10},
144143
{name: windows}
145144
]
146145
arch: ['']

CMakeLists.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ if(POLICY CMP0074)
66
cmake_policy(SET CMP0074 NEW)
77
endif()
88
project(level-zero-tests)
9-
set(CMAKE_CXX_STANDARD 17)
9+
set(CMAKE_CXX_STANDARD 20)
10+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
1011

1112
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
1213

@@ -50,9 +51,9 @@ set(_Boost_LOG_SETUP_DEPENDENCIES log)
5051
set(_Boost_LOG_DEPENDENCIES "")
5152
if(BUILD_ZE_PERF_TESTS_ONLY)
5253
# do not require boost when building perf tests only, will skip tests that use boost
53-
find_package(Boost 1.65 COMPONENTS log program_options timer chrono system serialization)
54+
find_package(Boost 1.76 COMPONENTS log program_options timer chrono system serialization)
5455
else()
55-
find_package(Boost 1.65 REQUIRED COMPONENTS log program_options timer chrono system serialization)
56+
find_package(Boost 1.76 REQUIRED COMPONENTS log program_options timer chrono system serialization)
5657
endif()
5758
message(STATUS "Boost_FOUND: ${Boost_FOUND}")
5859

0 commit comments

Comments
 (0)