From 0f85ce341238d47f5d478ab611f2a35f06ff3841 Mon Sep 17 00:00:00 2001
From: "Kozlowski, Marek" <marek.kozlowski@intel.com>
Date: Fri, 4 Jul 2025 06:17:26 +0000
Subject: [PATCH] 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 <marek.kozlowski@intel.com>
---
 .github/docker/rhel.Dockerfile    | 18 ++++++++++++
 .github/docker/sles.Dockerfile    | 25 ++++++++++++++--
 .github/docker/ubuntu.Dockerfile  | 49 +++++++++++++------------------
 .github/docker/windows.Dockerfile |  9 +++---
 .github/workflows/build-multi.yml |  5 ++--
 CMakeLists.txt                    |  7 +++--
 6 files changed, 72 insertions(+), 41 deletions(-)

diff --git a/.github/docker/rhel.Dockerfile b/.github/docker/rhel.Dockerfile
index f06d60ad8..a29438dfd 100644
--- a/.github/docker/rhel.Dockerfile
+++ b/.github/docker/rhel.Dockerfile
@@ -3,3 +3,21 @@
 ARG VMAJ
 ARG VMIN
 FROM ghcr.io/oneapi-src/level-zero-linux-compute/rhel:${VMAJ}.${VMIN}
+
+RUN <<EOF
+git clone --recurse-submodules --branch boost-1.76.0 https://github.com/boostorg/boost.git
+cd boost
+./bootstrap.sh
+./b2 install \
+  -j 4 \
+  address-model=64 \
+  --with-chrono \
+  --with-log \
+  --with-program_options \
+  --with-serialization \
+  --with-system \
+  --with-timer \
+  --with-date_time
+cd ..
+rm -rf boost
+EOF
\ No newline at end of file
diff --git a/.github/docker/sles.Dockerfile b/.github/docker/sles.Dockerfile
index f19d52be2..b756d7927 100644
--- a/.github/docker/sles.Dockerfile
+++ b/.github/docker/sles.Dockerfile
@@ -6,9 +6,29 @@ FROM ghcr.io/oneapi-src/level-zero-linux-compute/sles:${VMAJ}.${VMIN}
 
 SHELL ["/bin/bash", "-e", "-c"]
 
+ARG VMAJ
+ARG VMIN
+
+RUN <<EOF
+if [ "$VMIN" = "4" ]; then
+  update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 120 \
+    --slave /usr/bin/g++ g++ /usr/bin/g++-11
+  update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++-11 120
+  update-alternatives --install /usr/bin/cc cc /usr/bin/gcc-11 120
+elif [ "$VMIN" = "6" ]; then
+  update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 120 \
+    --slave /usr/bin/g++ g++ /usr/bin/g++-13
+  update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++-13 120
+  update-alternatives --install /usr/bin/cc cc /usr/bin/gcc-13 120
+fi
+update-alternatives --config gcc
+update-alternatives --config c++
+update-alternatives --config cc
+EOF
+
 # Static libraries for boost are not part of the SLES distribution
 RUN <<EOF
-git clone --recurse-submodules --branch boost-1.70.0 https://github.com/boostorg/boost.git
+git clone --recurse-submodules --branch boost-1.76.0 https://github.com/boostorg/boost.git
 cd boost
 ./bootstrap.sh
 ./b2 install \
@@ -19,7 +39,8 @@ cd boost
   --with-program_options \
   --with-serialization \
   --with-system \
+  --with-date_time \
   --with-timer
 cd ..
 rm -rf boost
-EOF
+EOF
\ No newline at end of file
diff --git a/.github/docker/ubuntu.Dockerfile b/.github/docker/ubuntu.Dockerfile
index 829177f24..bb0c57ab4 100644
--- a/.github/docker/ubuntu.Dockerfile
+++ b/.github/docker/ubuntu.Dockerfile
@@ -4,32 +4,23 @@ ARG VMAJ
 ARG VMIN
 FROM ghcr.io/oneapi-src/level-zero-linux-compute/ubuntu:${VMAJ}.${VMIN}
 
-ARG VMAJ
-ARG VMIN
-
-SHELL ["/bin/bash", "-e", "-c"]
-
-ENV DEBIAN_FRONTEND=noninteractive
-# /etc/apt/apt.conf.d/docker-clean doesn't work on older versions of docker for U2204 containers
-RUN --mount=type=cache,target=/var/cache/apt <<EOF
-rm /etc/apt/apt.conf.d/docker-clean
-apt-get update
-apt-get install -o Dpkg::Options::="--force-overwrite" -y \
-  build-essential \
-  ccache \
-  clang-tidy \
-  cmake \
-  curl \
-  file \
-  git \
-  ninja-build \
-  libboost-all-dev \
-  libpapi-dev \
-  libpng-dev \
-  libva-dev \
-  ocl-icd-opencl-dev \
-  opencl-headers \
-  python3 \
-  python3-pip
-rm -rf /var/lib/apt/lists/*
-EOF
+ENV BOOST_BUILD_PATH=/boost_1_76_0
+ADD https://archives.boost.io/release/1.76.0/source/boost_1_76_0.tar.gz /boost_1_76_0.tar.gz
+RUN <<EOF
+tar xf /boost_1_76_0.tar.gz
+rm /boost_1_76_0.tar.gz
+cd /boost_1_76_0
+./bootstrap.sh
+./b2 install \
+  -j $(nproc) \
+  link=static \
+  address-model=64 \
+  --with-chrono \
+  --with-log \
+  --with-program_options \
+  --with-regex \
+  --with-serialization \
+  --with-system \
+  --with-timer
+rm -rf /boost_1_76_0
+EOF
\ No newline at end of file
diff --git a/.github/docker/windows.Dockerfile b/.github/docker/windows.Dockerfile
index f0a34fdd3..e837129e8 100644
--- a/.github/docker/windows.Dockerfile
+++ b/.github/docker/windows.Dockerfile
@@ -90,9 +90,9 @@ cd ../.. && `
 rm -rf OpenCL-ICD-Loader-2024.10.24"
 
 RUN "`
-curl -OSL --ssl-no-revoke https://archives.boost.io/release/1.73.0/source/boost_1_73_0.7z && `
-7z.exe x boost_1_73_0.7z && `
-cd boost_1_73_0 && `
+curl -OSL --ssl-no-revoke https://archives.boost.io/release/1.76.0/source/boost_1_76_0.7z && `
+7z.exe x boost_1_76_0.7z && `
+cd boost_1_76_0 && `
 MSYS_NO_PATHCONV=1 cmd /c bootstrap.bat && `
 ./b2.exe install -j 16 address-model=64 `
   --with-chrono `
@@ -100,6 +100,7 @@ MSYS_NO_PATHCONV=1 cmd /c bootstrap.bat && `
   --with-program_options `
   --with-serialization `
   --with-system `
+  --with-date_time `
   --with-timer && `
 cd .. && `
-rm -rf boost_1_73_0"
+rm -rf boost_1_76_0"
diff --git a/.github/workflows/build-multi.yml b/.github/workflows/build-multi.yml
index 84065998e..5ab93bd64 100644
--- a/.github/workflows/build-multi.yml
+++ b/.github/workflows/build-multi.yml
@@ -137,10 +137,9 @@ jobs:
           {name: ubuntu, vmaj: 22, vmin: '04'},
           {name: ubuntu, vmaj: 24, vmin: '04'},
           {name: ubuntu, vmaj: 24, vmin: '10'},
-          {name: sles, vmaj: 15, vmin: 2},
-          {name: sles, vmaj: 15, vmin: 3},
           {name: sles, vmaj: 15, vmin: 4},
-          {name: rhel, vmaj: 8, vmin: 6},
+          {name: sles, vmaj: 15, vmin: 6},
+          {name: rhel, vmaj: 8, vmin: 10},
           {name: windows}
         ]
         arch: ['']
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 312856cc1..34a97362b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,8 @@ if(POLICY CMP0074)
   cmake_policy(SET CMP0074 NEW)
 endif()
 project(level-zero-tests)
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
@@ -50,9 +51,9 @@ set(_Boost_LOG_SETUP_DEPENDENCIES log)
 set(_Boost_LOG_DEPENDENCIES "")
 if(BUILD_ZE_PERF_TESTS_ONLY)
   # do not require boost when building perf tests only, will skip tests that use boost
-  find_package(Boost 1.65 COMPONENTS log program_options timer chrono system serialization)
+  find_package(Boost 1.76 COMPONENTS log program_options timer chrono system serialization)
 else()
-  find_package(Boost 1.65 REQUIRED COMPONENTS log program_options timer chrono system serialization)
+  find_package(Boost 1.76 REQUIRED COMPONENTS log program_options timer chrono system serialization)
 endif()
 message(STATUS "Boost_FOUND: ${Boost_FOUND}")