mirror of
https://github.com/catchorg/Catch2.git
synced 2025-04-27 19:35:43 +02:00
Upgrade CI runners to Ubuntu 22
This commit is contained in:
Chris Thrasher
parent
4c8671cfbb
commit
25b86ef3fd
49
.github/workflows/linux-other-builds.yml
vendored
49
.github/workflows/linux-other-builds.yml
vendored
@ -8,65 +8,66 @@ on: [push, pull_request]
|
|||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
name: ${{matrix.build_description}}, ${{matrix.cxx}}, C++${{matrix.std}} ${{matrix.build_type}}
|
name: ${{matrix.build_description}}, ${{matrix.cxx}}, C++${{matrix.std}} ${{matrix.build_type}}
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-22.04
|
||||||
strategy:
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
# We add builds one by one in this case, because there are no
|
# We add builds one by one in this case, because there are no
|
||||||
# dimensions that are shared across the builds
|
# dimensions that are shared across the builds
|
||||||
include:
|
include:
|
||||||
|
|
||||||
# Single surrogate header build
|
# Single surrogate header build
|
||||||
- cxx: clang++-10
|
- cxx: clang++-14
|
||||||
build_description: Surrogates build
|
build_description: Surrogates build
|
||||||
build_type: Debug
|
build_type: Debug
|
||||||
std: 14
|
std: 14
|
||||||
other_pkgs: clang-10
|
other_pkgs: clang-14
|
||||||
cmake_configurations: -DCATCH_BUILD_SURROGATES=ON
|
cmake_configurations: -DCATCH_BUILD_SURROGATES=ON
|
||||||
|
|
||||||
# Extras and examples with gcc-7
|
# Extras and examples with gcc-11
|
||||||
- cxx: g++-7
|
- cxx: g++-11
|
||||||
build_description: Extras + Examples
|
build_description: Extras + Examples
|
||||||
build_type: Debug
|
build_type: Debug
|
||||||
std: 14
|
std: 14
|
||||||
other_pkgs: g++-7
|
other_pkgs: g++-11
|
||||||
cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON -DCATCH_ENABLE_CMAKE_HELPER_TESTS=ON
|
cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON -DCATCH_ENABLE_CMAKE_HELPER_TESTS=ON
|
||||||
- cxx: g++-7
|
- cxx: g++-11
|
||||||
build_description: Extras + Examples
|
build_description: Extras + Examples
|
||||||
build_type: Release
|
build_type: Release
|
||||||
std: 14
|
std: 14
|
||||||
other_pkgs: g++-7
|
other_pkgs: g++-11
|
||||||
cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON -DCATCH_ENABLE_CMAKE_HELPER_TESTS=ON
|
cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON -DCATCH_ENABLE_CMAKE_HELPER_TESTS=ON
|
||||||
|
|
||||||
# Extras and examples with Clang-10
|
# Extras and examples with Clang-14
|
||||||
- cxx: clang++-10
|
- cxx: clang++-14
|
||||||
build_description: Extras + Examples
|
build_description: Extras + Examples
|
||||||
build_type: Debug
|
build_type: Debug
|
||||||
std: 17
|
std: 17
|
||||||
other_pkgs: clang-10
|
other_pkgs: clang-14
|
||||||
cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON -DCATCH_ENABLE_CMAKE_HELPER_TESTS=ON
|
cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON -DCATCH_ENABLE_CMAKE_HELPER_TESTS=ON
|
||||||
- cxx: clang++-10
|
- cxx: clang++-14
|
||||||
build_description: Extras + Examples
|
build_description: Extras + Examples
|
||||||
build_type: Release
|
build_type: Release
|
||||||
std: 17
|
std: 17
|
||||||
other_pkgs: clang-10
|
other_pkgs: clang-14
|
||||||
cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON -DCATCH_ENABLE_CMAKE_HELPER_TESTS=ON
|
cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON -DCATCH_ENABLE_CMAKE_HELPER_TESTS=ON
|
||||||
|
|
||||||
# Configure tests with Clang-10
|
# Configure tests with Clang-14
|
||||||
- cxx: clang++-10
|
- cxx: clang++-14
|
||||||
build_description: CMake configuration tests
|
build_description: CMake configuration tests
|
||||||
build_type: Debug
|
build_type: Debug
|
||||||
std: 14
|
std: 14
|
||||||
other_pkgs: clang-10
|
other_pkgs: clang-14
|
||||||
cmake_configurations: -DCATCH_ENABLE_CONFIGURE_TESTS=ON
|
cmake_configurations: -DCATCH_ENABLE_CONFIGURE_TESTS=ON
|
||||||
|
|
||||||
# Valgrind test Clang-10
|
# Valgrind test Clang-14
|
||||||
- cxx: clang++-10
|
# - cxx: clang++-14
|
||||||
build_description: Valgrind tests
|
# build_description: Valgrind tests
|
||||||
build_type: Debug
|
# build_type: Debug
|
||||||
std: 14
|
# std: 14
|
||||||
other_pkgs: clang-10 valgrind
|
# other_pkgs: clang-14 valgrind
|
||||||
cmake_configurations: -DMEMORYCHECK_COMMAND=`which valgrind` -DMEMORYCHECK_COMMAND_OPTIONS="-q --track-origins=yes --leak-check=full --num-callers=50 --show-leak-kinds=definite --error-exitcode=1"
|
# cmake_configurations: -DMEMORYCHECK_COMMAND=`which valgrind` -DMEMORYCHECK_COMMAND_OPTIONS="-q --track-origins=yes --leak-check=full --num-callers=50 --show-leak-kinds=definite --error-exitcode=1"
|
||||||
other_ctest_args: -T memcheck -LE uses-python
|
# other_ctest_args: -T memcheck -LE uses-python
|
||||||
|
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
|
|||||||
71
.github/workflows/linux-simple-builds.yml
vendored
71
.github/workflows/linux-simple-builds.yml
vendored
@ -5,28 +5,29 @@ on: [push, pull_request]
|
|||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
name: ${{matrix.cxx}}, C++${{matrix.std}}, ${{matrix.build_type}}
|
name: ${{matrix.cxx}}, C++${{matrix.std}}, ${{matrix.build_type}}
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-22.04
|
||||||
strategy:
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
cxx:
|
cxx:
|
||||||
- g++-5
|
|
||||||
- g++-6
|
|
||||||
- g++-7
|
- g++-7
|
||||||
- g++-8
|
- g++-8
|
||||||
- g++-9
|
- g++-9
|
||||||
- g++-10
|
- g++-10
|
||||||
|
- g++-11
|
||||||
|
- g++-12
|
||||||
- clang++-6.0
|
- clang++-6.0
|
||||||
- clang++-7
|
- clang++-7
|
||||||
- clang++-8
|
- clang++-8
|
||||||
- clang++-9
|
- clang++-9
|
||||||
- clang++-10
|
- clang++-10
|
||||||
|
- clang++-11
|
||||||
|
- clang++-12
|
||||||
|
- clang++-13
|
||||||
|
- clang++-14
|
||||||
build_type: [Debug, Release]
|
build_type: [Debug, Release]
|
||||||
std: [14]
|
std: [14]
|
||||||
include:
|
include:
|
||||||
- cxx: g++-5
|
|
||||||
other_pkgs: g++-5
|
|
||||||
- cxx: g++-6
|
|
||||||
other_pkgs: g++-6
|
|
||||||
- cxx: g++-7
|
- cxx: g++-7
|
||||||
other_pkgs: g++-7
|
other_pkgs: g++-7
|
||||||
- cxx: g++-8
|
- cxx: g++-8
|
||||||
@ -35,6 +36,10 @@ jobs:
|
|||||||
other_pkgs: g++-9
|
other_pkgs: g++-9
|
||||||
- cxx: g++-10
|
- cxx: g++-10
|
||||||
other_pkgs: g++-10
|
other_pkgs: g++-10
|
||||||
|
- cxx: g++-11
|
||||||
|
other_pkgs: g++-11
|
||||||
|
- cxx: g++-12
|
||||||
|
other_pkgs: g++-12
|
||||||
- cxx: clang++-6.0
|
- cxx: clang++-6.0
|
||||||
other_pkgs: clang-6.0
|
other_pkgs: clang-6.0
|
||||||
- cxx: clang++-7
|
- cxx: clang++-7
|
||||||
@ -45,51 +50,47 @@ jobs:
|
|||||||
other_pkgs: clang-9
|
other_pkgs: clang-9
|
||||||
- cxx: clang++-10
|
- cxx: clang++-10
|
||||||
other_pkgs: clang-10
|
other_pkgs: clang-10
|
||||||
# Clang 6 + C++17
|
- cxx: clang++-11
|
||||||
# does not work with the default libstdc++ version thanks
|
other_pkgs: clang-11
|
||||||
# to a disagreement on variant implementation.
|
- cxx: clang++-12
|
||||||
# - cxx: clang++-6.0
|
other_pkgs: clang-12
|
||||||
# build_type: Debug
|
- cxx: clang++-13
|
||||||
# std: 17
|
other_pkgs: clang-13
|
||||||
# other_pkgs: clang-6.0
|
- cxx: clang++-14
|
||||||
# - cxx: clang++-6.0
|
other_pkgs: clang-14
|
||||||
# build_type: Release
|
# Clang 14 + C++17
|
||||||
# std: 17
|
- cxx: clang++-14
|
||||||
# other_pkgs: clang-6.0
|
|
||||||
# Clang 10 + C++17
|
|
||||||
- cxx: clang++-10
|
|
||||||
build_type: Debug
|
build_type: Debug
|
||||||
std: 17
|
std: 17
|
||||||
other_pkgs: clang-10
|
other_pkgs: clang-14
|
||||||
- cxx: clang++-10
|
- cxx: clang++-14
|
||||||
build_type: Release
|
build_type: Release
|
||||||
std: 17
|
std: 17
|
||||||
other_pkgs: clang-10
|
other_pkgs: clang-14
|
||||||
- cxx: clang++-10
|
- cxx: clang++-14
|
||||||
build_type: Debug
|
build_type: Debug
|
||||||
std: 20
|
std: 20
|
||||||
other_pkgs: clang-10
|
other_pkgs: clang-14
|
||||||
- cxx: clang++-10
|
- cxx: clang++-14
|
||||||
build_type: Release
|
build_type: Release
|
||||||
std: 20
|
std: 20
|
||||||
other_pkgs: clang-10
|
other_pkgs: clang-14
|
||||||
- cxx: g++-10
|
- cxx: g++-11
|
||||||
build_type: Debug
|
build_type: Debug
|
||||||
std: 20
|
std: 20
|
||||||
other_pkgs: g++-10
|
other_pkgs: g++-11
|
||||||
- cxx: g++-10
|
- cxx: g++-11
|
||||||
build_type: Release
|
build_type: Release
|
||||||
std: 20
|
std: 20
|
||||||
other_pkgs: g++-10
|
other_pkgs: g++-11
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Add repositories for older GCC
|
- name: Add repositories for older compilers
|
||||||
run: |
|
run: |
|
||||||
sudo apt-add-repository 'deb http://azure.archive.ubuntu.com/ubuntu/ bionic main'
|
sudo apt-add-repository 'deb http://azure.archive.ubuntu.com/ubuntu/ focal main'
|
||||||
sudo apt-add-repository 'deb http://azure.archive.ubuntu.com/ubuntu/ bionic universe'
|
sudo apt-add-repository 'deb http://azure.archive.ubuntu.com/ubuntu/ focal universe'
|
||||||
if: ${{ matrix.cxx == 'g++-5' || matrix.cxx == 'g++-6' }}
|
|
||||||
|
|
||||||
- name: Prepare environment
|
- name: Prepare environment
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
@ -5,7 +5,7 @@ on: [push, pull_request]
|
|||||||
jobs:
|
jobs:
|
||||||
conan_builds:
|
conan_builds:
|
||||||
name: Conan ${{matrix.conan_version}}
|
name: Conan ${{matrix.conan_version}}
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-22.04
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
conan_version:
|
conan_version:
|
||||||
|
|||||||
2
.github/workflows/validate-header-guards.yml
vendored
2
.github/workflows/validate-header-guards.yml
vendored
@ -5,7 +5,7 @@ on: [push, pull_request]
|
|||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
# Set the type of machine to run on
|
# Set the type of machine to run on
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-22.04
|
||||||
steps:
|
steps:
|
||||||
|
|
||||||
- name: Checkout source code
|
- name: Checkout source code
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user