Tidy up CI matrix config

Also re-enable testing Clang 16 with modules on MacOS, because we can't do it on Linux at the moment
tcbrindle · Jan 28, 2024 · 68cf4a8 · 68cf4a8
1 parent f04d421
commit 68cf4a8
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 34 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -11,9 +11,18 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        build_type: [Debug, Release]
         compiler: [GCC-11, GCC-12, GCC-13, Clang-17]
-        test_with: [Headers]
+        test_with: [Headers, Module]
+        build_type: [Debug, Release]
+
+        exclude:
+          - compiler: GCC-11
+            test_with: Module
+          - compiler: GCC-12
+            test_with: Module
+          - compiler: GCC-13
+            test_with: Module
+
         include:
           - compiler: GCC-11
             cxx: g++-11
@@ -35,20 +44,6 @@ jobs:
             install: |
               brew install llvm@17 ninja binutils
               brew link --force binutils
-          - compiler: Clang-17
-            build_type: Debug
-            cxx: clang++
-            test_with: Module
-            install: |
-              brew install llvm@17 ninja binutils
-              brew link --force binutils
-          - compiler: Clang-17
-            build_type: Release
-            cxx: clang++
-            test_with: Module
-            install: |
-              brew install llvm@17 ninja binutils
-              brew link --force binutils
 
     steps:
     - uses: actions/checkout@master

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -14,34 +14,29 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
+        compiler: [GCC-13, LLVM-Clang-16, LLVM-Clang-17]
+        test_with: [Headers, Module]
         build_type: [Debug, Release]
-        cxx: [g++-13,
-              /usr/local/opt/llvm@16/bin/clang++,
-              /usr/local/opt/llvm@17/bin/clang++]
-        test_with: [Headers]
+
+        exclude:
+          - compiler: GCC-13
+            test_with: Module
 
         include:
-          - cxx: g++-13
+          - compiler: GCC-13
+            cxx: g++-13
             install: |
               brew update
               brew install gcc@13 ninja
-          - cxx: /usr/local/opt/llvm@16/bin/clang++
+          - compiler: LLVM-Clang-16
+            cxx: /usr/local/opt/llvm@16/bin/clang++
             install: |
               brew install llvm@16 ninja
-          - cxx: /usr/local/opt/llvm@17/bin/clang++
-            install: |
-              brew install llvm@17 ninja
-            test_with: Headers
-          - build_type: Debug
-            cxx: /usr/local/opt/llvm@17/bin/clang++
-            install: |
-              brew install llvm@17 ninja
-            test_with: Module
-          - build_type: Release
+          - compiler: LLVM-Clang-17
             cxx: /usr/local/opt/llvm@17/bin/clang++
             install: |
               brew install llvm@17 ninja
-            test_with: Module
+
 
     steps:
     - uses: actions/checkout@master
@@ -56,7 +51,7 @@ jobs:
       run: |
         cmake -GNinja -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DCMAKE_CXX_COMPILER=${{matrix.cxx}} \
                -DFLUX_BUILD_BENCHMARKS=${{matrix.build_type == 'Release'}} \
-               -DFLUX_BUILD_MODULE=${{matrix.cxx != 'g++-13'}} \
+               -DFLUX_BUILD_MODULE=${{matrix.test_with == 'Module'}} \
                -DFLUX_BUILD_TESTS_USING_MODULE=${{matrix.test_with == 'Module'}} \
                $GITHUB_WORKSPACE
 

diff --git a/docs/overview.rst b/docs/overview.rst
@@ -0,0 +1 @@
+    for (int i = 0; i < size; i++) {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		for (int i = 0; i < size; i++) {
Check warning on line 1 in docs/overview.rst View workflow job for this annotation GitHub Actions / build `document isn't included in any toctree`