From 5eadf1d446ea7c49ebfd1ba5baa5342e0281899c Mon Sep 17 00:00:00 2001 From: David Eriksson Date: Mon, 29 Sep 2025 19:27:28 +0200 Subject: [PATCH 1/2] Build with both gcc 14 and 15 --- .github/workflows/cmake.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 27f92901..cc1272c9 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -19,7 +19,8 @@ jobs: matrix: platform: - { name: macOS, os: macos-latest, shell: sh } - - { name: Ubuntu, os: ubuntu-latest, shell: sh } + - { name: Ubuntu GCC 14, os: ubuntu-latest, shell: sh, gcc: 14 } + - { name: Ubuntu GCC 15, os: ubuntu-latest, shell: sh, gcc: 15 } - { name: Windows - mingw32, os: windows-latest, shell: 'msys2 {0}', msystem: mingw32, msys-env: mingw-w64-i686 } - { name: Windows - mingw64, os: windows-latest, shell: 'msys2 {0}', msystem: mingw64, msys-env: mingw-w64-x86_64 } build-type: [Release] @@ -34,6 +35,15 @@ jobs: sudo apt-get install \ libssl-dev ninja-build zlib1g-dev + - name: Select GCC version + if: runner.os == 'Linux' + run: | + sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y + sudo apt-get update + sudo apt-get install -y gcc-${{matrix.platform.gcc}} g++-${{matrix.platform.gcc}} + sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${{matrix.platform.gcc}} 100 + sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-${{matrix.platform.gcc}} 100 + - name: Setup macOS dependencies if: runner.os == 'macOS' run: | From ba6e6e2d516ad1dee315257a1269a95a7b99bf6f Mon Sep 17 00:00:00 2001 From: David Eriksson Date: Mon, 29 Sep 2025 19:37:02 +0200 Subject: [PATCH 2/2] Try ppa --- .github/workflows/cmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index cc1272c9..98823330 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -38,7 +38,7 @@ jobs: - name: Select GCC version if: runner.os == 'Linux' run: | - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y + sudo add-apt-repository ppa:ubuntu-toolchain-r/ppa -y sudo apt-get update sudo apt-get install -y gcc-${{matrix.platform.gcc}} g++-${{matrix.platform.gcc}} sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${{matrix.platform.gcc}} 100