Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/.github/workflows
diff options
context:
space:
mode:
authorMartin Hořeňovský2021-04-30 14:02:30 +0200
committerMartin Hořeňovský2021-04-30 23:26:28 +0200
commit2cb5210caf35bf8fc29ade2e5570cc0f37537951 (patch)
treed93bf23deb47dbd8be181904d100f3c424a72e9e /.github/workflows
parent2dc5a5f402831a659681b6e7c1ee7f7b93489a82 (diff)
downloadcatch3-2cb5210caf35bf8fc29ade2e5570cc0f37537951.tar.gz
Fix and improve GitHub Actions CI
* Fixed problem with older compilers by explicitly installing the right compiler version. * Split apart simple builds that can be well described by a build matrix, and builds that need special CMake defines or similar special snowflake handling. * Ported some extras + examples builds from TravisCI to GitHub Actions.
Diffstat (limited to '.github/workflows')
-rw-r--r--.github/workflows/linux-other-builds.yml86
-rw-r--r--.github/workflows/linux-simple-builds.yml (renamed from .github/workflows/linux-builds.yml)33
2 files changed, 106 insertions, 13 deletions
diff --git a/.github/workflows/linux-other-builds.yml b/.github/workflows/linux-other-builds.yml
new file mode 100644
index 00000000..61ebf3d7
--- /dev/null
+++ b/.github/workflows/linux-other-builds.yml
@@ -0,0 +1,86 @@
+# The builds in this file are more complex (e.g. they need custom CMake
+# configuration) and thus are unsuitable to the simple build matrix
+# approach used in simple-builds
+name: Linux builds (complex)
+
+on: [push, pull_request]
+
+jobs:
+ build:
+ name: ${{matrix.build_description}}, ${{matrix.cxx}}, C++${{matrix.std}} ${{matrix.build_type}}
+ runs-on: ubuntu-20.04
+ strategy:
+ matrix:
+ # We add builds one by one in this case, because there are no
+ # dimensions that are shared across the builds
+ include:
+
+ # Single surrogate header build
+ - cxx: clang++-10
+ build_description: Surrogates build
+ build_type: Debug
+ std: 14
+ other_pkgs: clang-10
+ cmake_configurations: -DCATCH_BUILD_SURROGATES=ON
+
+ # Extras and examples with gcc-7
+ - cxx: g++-7
+ build_description: Extras + Examples
+ build_type: Debug
+ std: 14
+ other_pkgs: g++-7
+ cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON
+ - cxx: g++-7
+ build_description: Extras + Examples
+ build_type: Release
+ std: 14
+ other_pkgs: g++-7
+ cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON
+
+ # Extras and examples with Clang-10
+ - cxx: clang++-10
+ build_description: Extras + Examples
+ build_type: Debug
+ std: 17
+ other_pkgs: clang-10
+ cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON
+ - cxx: clang++-10
+ build_description: Extras + Examples
+ build_type: Release
+ std: 17
+ other_pkgs: clang-10
+ cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON
+
+
+ steps:
+ - uses: actions/checkout@v2
+
+ - name: Prepare environment
+ run: sudo apt-get install -y ninja-build ${{matrix.other_pkgs}}
+
+ - name: Configure build
+ working-directory: ${{runner.workspace}}
+ env:
+ CXX: ${{matrix.cxx}}
+ CXXFLAGS: ${{matrix.cxxflags}}
+ # Note: $GITHUB_WORKSPACE is distinct from ${{runner.workspace}}.
+ # This is important
+ run: |
+ cmake -Bbuild -H$GITHUB_WORKSPACE \
+ -DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
+ -DCMAKE_CXX_STANDARD=${{matrix.std}} \
+ -DCMAKE_CXX_EXTENSIONS=OFF \
+ -DCATCH_DEVELOPMENT_BUILD=ON \
+ ${{matrix.cmake_configurations}} \
+ -G Ninja
+
+ - name: Build tests + lib
+ working-directory: ${{runner.workspace}}/build
+ run: ninja
+
+ - name: Run tests
+ env:
+ CTEST_OUTPUT_ON_FAILURE: 1
+ working-directory: ${{runner.workspace}}/build
+ # Hardcode 2 cores we know are there
+ run: ctest -C ${{matrix.build_type}} -j 2
diff --git a/.github/workflows/linux-builds.yml b/.github/workflows/linux-simple-builds.yml
index 3d2b41ef..a9abcdfc 100644
--- a/.github/workflows/linux-builds.yml
+++ b/.github/workflows/linux-simple-builds.yml
@@ -1,9 +1,10 @@
-name: Linux builds
+name: Linux builds (basic)
on: [push, pull_request]
jobs:
build:
+ name: ${{matrix.cxx}}, C++${{matrix.std}}, ${{matrix.build_type}}
runs-on: ubuntu-20.04
strategy:
matrix:
@@ -20,35 +21,42 @@ jobs:
- clang++-10
build_type: [Debug, Release]
std: [14]
- surrogates: [OFF]
include:
# cannot be installed on ubuntu-20.04 be default?
# - cxx: g++-6
# other_pkgs: g++-6
+ - cxx: g++-7
+ other_pkgs: g++-7
+ - cxx: g++-8
+ other_pkgs: g++-8
- cxx: clang++-6.0
other_pkgs: clang-6.0
- cxx: clang++-7
other_pkgs: clang-7
+ - cxx: clang++-8
+ other_pkgs: clang-8
- cxx: clang++-10
other_pkgs: clang-10
- # We want one build to build surrogates -- but not more, to
- # avoid trouble with long compilation/CI times.
- - cxx: clang++-10
- build_type: Debug
- std: 14
- other_pkgs: clang-10
- surrogates: ON
- # Clang 10 + C++17
+ # Clang 6 + C++17
+ # does not work with the default libstdc++ version thanks
+ # to a disagreement on variant implementation.
+ # - cxx: clang++-6.0
+ # build_type: Debug
+ # std: 17
+ # other_pkgs: clang-6.0
+ # - cxx: clang++-6.0
+ # build_type: Release
+ # std: 17
+ # other_pkgs: clang-6.0
+ # Clang 10 + C++17
- cxx: clang++-10
build_type: Debug
std: 17
other_pkgs: clang-10
- surrogates: OFF
- cxx: clang++-10
build_type: Release
std: 17
other_pkgs: clang-10
- surrogates: OFF
steps:
- uses: actions/checkout@v2
@@ -69,7 +77,6 @@ jobs:
-DCMAKE_CXX_STANDARD=${{matrix.std}} \
-DCMAKE_CXX_EXTENSIONS=OFF \
-DCATCH_DEVELOPMENT_BUILD=ON \
- -DCATCH_BUILD_SURROGATES=${{matrix.surrogates}} \
-G Ninja
- name: Build tests + lib