From 9cc1bf109372bf0964a6acca488a3e6ac64106dc Mon Sep 17 00:00:00 2001 From: ByteHamster Date: Mon, 26 May 2025 09:58:59 +0200 Subject: [PATCH] Fix CI after Ubuntu 20.04 discontinuation --- .github/workflows/cmake.yml | 54 +++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index c6170d9..738cebe 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -14,59 +14,61 @@ jobs: fail-fast: false matrix: config: - # Run Tests on Ubuntu 22.04 - - name: "Ubuntu 22.04 Debug SQLite" - os: ubuntu-22.04 + # Run Tests on Ubuntu + - name: "Ubuntu Debug SQLite" + os: ubuntu-latest build_type: "Debug" test_database: "sqlite" - - name: "Ubuntu 22.04 Release SQLite" - os: ubuntu-22.04 + - name: "Ubuntu Release SQLite" + os: ubuntu-latest build_type: "Release" test_database: "sqlite" - - name: "Ubuntu 22.04 Debug PostgreSQL" - os: ubuntu-22.04 + - name: "Ubuntu Debug PostgreSQL" + os: ubuntu-latest build_type: "Debug" test_database: "postgresql" - - name: "Ubuntu 22.04 Release PostgreSQL" - os: ubuntu-22.04 + - name: "Ubuntu Release PostgreSQL" + os: ubuntu-latest build_type: "Release" test_database: "postgresql" - - name: "Ubuntu 22.04 Debug MySQL" - os: ubuntu-22.04 + - name: "Ubuntu Debug MySQL" + os: ubuntu-latest build_type: "Debug" test_database: "mysql" - - name: "Ubuntu 22.04 Release MySQL" - os: ubuntu-22.04 + - name: "Ubuntu Release MySQL" + os: ubuntu-latest build_type: "Release" test_database: "mysql" - # Run Tests on Ubuntu 20.04 - - name: "Ubuntu 20.04 Release SQLite" - os: ubuntu-20.04 + # Run Tests on Ubuntu with different GCC versions + - name: "Ubuntu Release sqlite GCC 11" + os: ubuntu-latest build_type: "Release" test_database: "sqlite" + gcc_install: "11" - - name: "Ubuntu 20.04 Release PostgreSQL" - os: ubuntu-20.04 + - name: "Ubuntu Release sqlite GCC 12" + os: ubuntu-latest build_type: "Release" - test_database: "postgresql" + test_database: "sqlite" + gcc_install: "12" - - name: "Ubuntu 20.04 Release MySQL" - os: ubuntu-20.04 + - name: "Ubuntu Release sqlite GCC 13" + os: ubuntu-latest build_type: "Release" - test_database: "mysql" + test_database: "sqlite" + gcc_install: "13" - # Run Tests on Ubuntu 20.04 with newer GCC - - name: "Ubuntu 20.04 gcc 11 Release SQLite" - os: ubuntu-20.04 + - name: "Ubuntu Release sqlite GCC 14" + os: ubuntu-latest build_type: "Release" - gcc_install: "11" test_database: "sqlite" + gcc_install: "14" # Run Tests on MacOS - name: "macOS Debug SQLite"