From eaf912017f0e42581aa288cc95eb4c3a5cc67dd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20S=C3=BC=C3=9Fenbach?= Date: Thu, 31 Oct 2024 17:25:04 +0100 Subject: [PATCH] Add CI support for ubuntu-24.04 (#1987) --- .github/workflows/ci-ubuntu.yml | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci-ubuntu.yml b/.github/workflows/ci-ubuntu.yml index f5b73ca..b628ee1 100644 --- a/.github/workflows/ci-ubuntu.yml +++ b/.github/workflows/ci-ubuntu.yml @@ -13,8 +13,6 @@ jobs: strategy: matrix: - os: [ubuntu-20.04, ubuntu-22.04] - compiler: [g++-10] include: - os: ubuntu-20.04 compiler: clang++-10 @@ -22,16 +20,34 @@ jobs: compiler: clang++-11 - os: ubuntu-20.04 compiler: clang++-12 + - os: ubuntu-20.04 + compiler: g++-10 + - os: ubuntu-22.04 compiler: clang++-13 - os: ubuntu-22.04 compiler: clang++-14 - os: ubuntu-22.04 compiler: clang++-15 + - os: ubuntu-22.04 + compiler: g++-10 - os: ubuntu-22.04 compiler: g++-11 - os: ubuntu-22.04 compiler: g++-12 + + - os: ubuntu-24.04 + compiler: clang++-16 + - os: ubuntu-24.04 + compiler: clang++-17 + - os: ubuntu-24.04 + compiler: clang++-18 + - os: ubuntu-24.04 + compiler: g++-12 + - os: ubuntu-24.04 + compiler: g++-13 + - os: ubuntu-24.04 + compiler: g++-14 runs-on: ${{matrix.os}} @@ -55,7 +71,7 @@ jobs: for build_type in Debug Release do echo "=================================================================================" - echo "Building C++" $cpp_standard " in " $build_type " mode on " ${{matrix.os}} " with " ${{matrix.compiler}} + echo "Building C++"$cpp_standard" in "$build_type" mode on "${{matrix.os}}" with "${{matrix.compiler}} echo "=================================================================================" cmake -B build/$cpp_standard/$build_type -GNinja \ -DVULKAN_HPP_SAMPLES_BUILD=ON \ @@ -74,14 +90,15 @@ jobs: - name: Loop over build_types (Debug, Release) with cpp_standard 23 for compilers supporting that run: | - if [[ ${{matrix.compiler}} != clang++-10 && ${{matrix.compiler}} != clang++-11 && ${{matrix.compiler}} != g++-10 ]] + # clang++17 gives in some strange errors in std::tuple! + if [[ ${{matrix.compiler}} != clang++-10 && ${{matrix.compiler}} != clang++-11 && ${{matrix.compiler}} != clang++-17 && ${{matrix.compiler}} != g++-10 ]] then cpp_standard=23 - echo "=================================================================================" - echo "Building C++" $cpp_standard " in " $build_type " mode on " ${{matrix.os}} " with " ${{matrix.compiler}} - echo "=================================================================================" for build_type in Debug Release do + echo "=================================================================================" + echo "Building C++"$cpp_standard" in "$build_type" mode on "${{matrix.os}}" with "${{matrix.compiler}} + echo "=================================================================================" cmake -B build/$cpp_standard/$build_type -GNinja \ -DVULKAN_HPP_SAMPLES_BUILD=ON \ -DVULKAN_HPP_SAMPLES_BUILD_ONLY_DYNAMIC=ON \