Workaround apt-add-repository timeouts

This commit is contained in:
Victor Zverovich 2026-05-01 13:24:30 -07:00
parent 8f20ee6191
commit 7aabdcf0ba
2 changed files with 5 additions and 10 deletions

View File

@ -12,7 +12,7 @@ jobs:
${{matrix.gen}} ${{matrix.fuzz && 'Fuzz' || ''}}
${{matrix.shared && 'Shared' || ''}}
${{matrix.cxxflags_extra && 'Sanitize' || ''}}
runs-on: ubuntu-22.04
runs-on: ${{ matrix.os || 'ubuntu-22.04' }}
strategy:
matrix:
cxx: [g++-4.9, g++-11, clang++-3.6, clang++-11]
@ -35,12 +35,12 @@ jobs:
- cxx: g++-13
build_type: Release
std: 23
install: sudo apt install g++-13
os: ubuntu-24.04
shared: -DBUILD_SHARED_LIBS=ON
- cxx: g++-15
- cxx: g++-14
build_type: Release
std: 23
install: sudo apt install g++-15
os: ubuntu-24.04
gen: Ninja
- cxx: clang++-3.6
- cxx: clang++-11
@ -144,11 +144,6 @@ jobs:
clang-3.6_3.6.2-3ubuntu2_amd64.deb
if: ${{ matrix.cxx == 'clang++-3.6' }}
- name: Add repositories for newer GCC
run: |
sudo apt-add-repository ppa:ubuntu-toolchain-r/test
if: ${{ matrix.cxx == 'g++-13' || matrix.cxx == 'g++-15' }}
- name: Install LLVM-20
run: |
wget https://apt.llvm.org/llvm.sh

View File

@ -63,7 +63,7 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.28 AND CMAKE_CXX_STANDARD
OUTPUT_VARIABLE NINJA_VERSION)
if (NINJA_VERSION VERSION_GREATER_EQUAL 1.11)
if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION
GREATER_EQUAL 14)
GREATER_EQUAL 15)
OR (CMAKE_CXX_COMPILER_ID STREQUAL "Clang"
AND CMAKE_CXX_COMPILER_VERSION GREATER_EQUAL 16)
OR (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND MSVC_VERSION