Skip to content

Commit 0018292

Browse files
ChrisThrasherChrisThrasher
committed
Stop using Ubuntu 20 CI runners
1 parent 4c8671c commit 0018292

File tree

4 files changed

+214
-214
lines changed

4 files changed

+214
-214
lines changed

‎.github/workflows/linux-other-builds.yml

+97-97
Original file line numberDiff line numberDiff line change
@@ -6,103 +6,103 @@ name: Linux builds (complex)
66
on: [push, pull_request]
77

88
jobs:
9-
build:
10-
name: ${{matrix.build_description}}, ${{matrix.cxx}}, C++${{matrix.std}} ${{matrix.build_type}}
11-
runs-on: ubuntu-20.04
12-
strategy:
13-
matrix:
14-
# We add builds one by one in this case, because there are no
15-
# dimensions that are shared across the builds
16-
include:
17-
18-
# Single surrogate header build
19-
- cxx: clang++-10
20-
build_description: Surrogates build
21-
build_type: Debug
22-
std: 14
23-
other_pkgs: clang-10
24-
cmake_configurations: -DCATCH_BUILD_SURROGATES=ON
25-
26-
# Extras and examples with gcc-7
27-
- cxx: g++-7
28-
build_description: Extras + Examples
29-
build_type: Debug
30-
std: 14
31-
other_pkgs: g++-7
32-
cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON -DCATCH_ENABLE_CMAKE_HELPER_TESTS=ON
33-
- cxx: g++-7
34-
build_description: Extras + Examples
35-
build_type: Release
36-
std: 14
37-
other_pkgs: g++-7
38-
cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON -DCATCH_ENABLE_CMAKE_HELPER_TESTS=ON
39-
40-
# Extras and examples with Clang-10
41-
- cxx: clang++-10
42-
build_description: Extras + Examples
43-
build_type: Debug
44-
std: 17
45-
other_pkgs: clang-10
46-
cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON -DCATCH_ENABLE_CMAKE_HELPER_TESTS=ON
47-
- cxx: clang++-10
48-
build_description: Extras + Examples
49-
build_type: Release
50-
std: 17
51-
other_pkgs: clang-10
52-
cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON -DCATCH_ENABLE_CMAKE_HELPER_TESTS=ON
53-
54-
# Configure tests with Clang-10
55-
- cxx: clang++-10
56-
build_description: CMake configuration tests
57-
build_type: Debug
58-
std: 14
59-
other_pkgs: clang-10
60-
cmake_configurations: -DCATCH_ENABLE_CONFIGURE_TESTS=ON
61-
62-
# Valgrind test Clang-10
63-
- cxx: clang++-10
64-
build_description: Valgrind tests
65-
build_type: Debug
66-
std: 14
67-
other_pkgs: clang-10 valgrind
68-
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"
69-
other_ctest_args: -T memcheck -LE uses-python
70-
71-
72-
steps:
73-
- uses: actions/checkout@v4
74-
75-
- name: Prepare environment
76-
run: |
77-
sudo apt-get update
78-
sudo apt-get install -y ninja-build ${{matrix.other_pkgs}}
79-
80-
- name: Configure build
81-
working-directory: ${{runner.workspace}}
82-
env:
83-
CXX: ${{matrix.cxx}}
84-
CXXFLAGS: ${{matrix.cxxflags}}
85-
# Note: $GITHUB_WORKSPACE is distinct from ${{runner.workspace}}.
86-
# This is important
87-
run: |
88-
cmake -Bbuild -H$GITHUB_WORKSPACE \
89-
-DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
90-
-DCMAKE_CXX_STANDARD=${{matrix.std}} \
91-
-DCMAKE_CXX_STANDARD_REQUIRED=ON \
92-
-DCMAKE_CXX_EXTENSIONS=OFF \
93-
-DCATCH_DEVELOPMENT_BUILD=ON \
94-
${{matrix.cmake_configurations}} \
95-
-G Ninja
96-
97-
- name: Build tests + lib
98-
working-directory: ${{runner.workspace}}/build
99-
run: ninja
100-
101-
- name: Run tests
102-
env:
103-
CTEST_OUTPUT_ON_FAILURE: 1
104-
working-directory: ${{runner.workspace}}/build
105-
run: ctest -C ${{matrix.build_type}} -j `nproc` ${{matrix.other_ctest_args}}
9+
# build:
10+
# name: ${{matrix.build_description}}, ${{matrix.cxx}}, C++${{matrix.std}} ${{matrix.build_type}}
11+
# runs-on: ubuntu-20.04
12+
# strategy:
13+
# matrix:
14+
# # We add builds one by one in this case, because there are no
15+
# # dimensions that are shared across the builds
16+
# include:
17+
18+
# # Single surrogate header build
19+
# - cxx: clang++-10
20+
# build_description: Surrogates build
21+
# build_type: Debug
22+
# std: 14
23+
# other_pkgs: clang-10
24+
# cmake_configurations: -DCATCH_BUILD_SURROGATES=ON
25+
26+
# # Extras and examples with gcc-7
27+
# - cxx: g++-7
28+
# build_description: Extras + Examples
29+
# build_type: Debug
30+
# std: 14
31+
# other_pkgs: g++-7
32+
# cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON -DCATCH_ENABLE_CMAKE_HELPER_TESTS=ON
33+
# - cxx: g++-7
34+
# build_description: Extras + Examples
35+
# build_type: Release
36+
# std: 14
37+
# other_pkgs: g++-7
38+
# cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON -DCATCH_ENABLE_CMAKE_HELPER_TESTS=ON
39+
40+
# # Extras and examples with Clang-10
41+
# - cxx: clang++-10
42+
# build_description: Extras + Examples
43+
# build_type: Debug
44+
# std: 17
45+
# other_pkgs: clang-10
46+
# cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON -DCATCH_ENABLE_CMAKE_HELPER_TESTS=ON
47+
# - cxx: clang++-10
48+
# build_description: Extras + Examples
49+
# build_type: Release
50+
# std: 17
51+
# other_pkgs: clang-10
52+
# cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON -DCATCH_ENABLE_CMAKE_HELPER_TESTS=ON
53+
54+
# # Configure tests with Clang-10
55+
# - cxx: clang++-10
56+
# build_description: CMake configuration tests
57+
# build_type: Debug
58+
# std: 14
59+
# other_pkgs: clang-10
60+
# cmake_configurations: -DCATCH_ENABLE_CONFIGURE_TESTS=ON
61+
62+
# # Valgrind test Clang-10
63+
# - cxx: clang++-10
64+
# build_description: Valgrind tests
65+
# build_type: Debug
66+
# std: 14
67+
# other_pkgs: clang-10 valgrind
68+
# 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"
69+
# other_ctest_args: -T memcheck -LE uses-python
70+
71+
72+
# steps:
73+
# - uses: actions/checkout@v4
74+
75+
# - name: Prepare environment
76+
# run: |
77+
# sudo apt-get update
78+
# sudo apt-get install -y ninja-build ${{matrix.other_pkgs}}
79+
80+
# - name: Configure build
81+
# working-directory: ${{runner.workspace}}
82+
# env:
83+
# CXX: ${{matrix.cxx}}
84+
# CXXFLAGS: ${{matrix.cxxflags}}
85+
# # Note: $GITHUB_WORKSPACE is distinct from ${{runner.workspace}}.
86+
# # This is important
87+
# run: |
88+
# cmake -Bbuild -H$GITHUB_WORKSPACE \
89+
# -DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
90+
# -DCMAKE_CXX_STANDARD=${{matrix.std}} \
91+
# -DCMAKE_CXX_STANDARD_REQUIRED=ON \
92+
# -DCMAKE_CXX_EXTENSIONS=OFF \
93+
# -DCATCH_DEVELOPMENT_BUILD=ON \
94+
# ${{matrix.cmake_configurations}} \
95+
# -G Ninja
96+
97+
# - name: Build tests + lib
98+
# working-directory: ${{runner.workspace}}/build
99+
# run: ninja
100+
101+
# - name: Run tests
102+
# env:
103+
# CTEST_OUTPUT_ON_FAILURE: 1
104+
# working-directory: ${{runner.workspace}}/build
105+
# run: ctest -C ${{matrix.build_type}} -j `nproc` ${{matrix.other_ctest_args}}
106106
clang-tidy:
107107
name: clang-tidy ${{matrix.version}}, ${{matrix.build_description}}, C++${{matrix.std}} ${{matrix.build_type}}
108108
runs-on: ubuntu-22.04

0 commit comments

Comments
 (0)