Merge pull request #186 from tcbrindle/pr/fix-ci-yet-again

Update CI again
tcbrindle · May 17, 2024 · 7e98c0a · 7e98c0a
2 parents faf2e0f + b055ffa
commit 7e98c0a
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 10 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -40,7 +40,7 @@ jobs:
               brew install gcc@13 ninja binutils
               brew link --force binutils
           - compiler: Clang-17
-            cxx: clang++
+            cxx: $(brew --prefix llvm@17)/bin/clang++
             install: |
               brew install llvm@17 ninja binutils
               brew link --force binutils

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -20,22 +20,22 @@ jobs:
 
         exclude:
           - compiler: GCC-13
-            test_with: Module
+        #    test_with: Module
           - compiler: LLVM-Clang-16
             test_with: Module
 
         include:
-          - compiler: GCC-13
-            cxx: g++-13
-            install: |
-              brew update
-              brew install gcc@13 ninja
+        #  - compiler: GCC-13
+        #    cxx: g++-13
+        #    install: |
+        #      brew update
+        #      brew install gcc@13 ninja
           - compiler: LLVM-Clang-16
-            cxx: /usr/local/opt/llvm@16/bin/clang++
+            cxx: $(brew --prefix llvm@16)/bin/clang++
             install: |
               brew install llvm@16 ninja
           - compiler: LLVM-Clang-17
-            cxx: /usr/local/opt/llvm@17/bin/clang++
+            cxx: $(brew --prefix llvm@17)/bin/clang++
             install: |
               brew install llvm@17 ninja
 

diff --git a/test/test_adjacent.cpp b/test/test_adjacent.cpp
@@ -6,6 +6,7 @@
 #include "catch.hpp"
 
 #include <array>
+#include <tuple>
 
 #include "test_utils.hpp"
 

diff --git a/test/test_cartesian_power.cpp b/test/test_cartesian_power.cpp
@@ -8,7 +8,7 @@
 #include "catch.hpp"
 
 #include <array>
-
+#include <tuple>
 
 #include "test_utils.hpp"
 

diff --git a/test/test_cartesian_product.cpp b/test/test_cartesian_product.cpp
@@ -10,6 +10,7 @@
 #include <array>
 #include <iostream>
 #include <string_view>
+#include <tuple>
 
 #include "test_utils.hpp"
 

diff --git a/test/test_optional.cpp b/test/test_optional.cpp
@@ -5,6 +5,7 @@
 
 #include "catch.hpp"
 
+#include <optional> // std::nullopt
 #include <utility> // std::as_const
 
 #include "test_utils.hpp"

diff --git a/test/test_simple_sequence.cpp b/test/test_simple_sequence.cpp
@@ -5,6 +5,7 @@
 #include "catch.hpp"
 
 #include <array>
+#include <optional>
 
 #include "test_utils.hpp"
 

diff --git a/test/test_take.cpp b/test/test_take.cpp
@@ -7,6 +7,7 @@
 
 #include <array>
 #include <list>
+#include <optional>
 
 #include "test_utils.hpp"
 

diff --git a/test/test_zip_algorithms.cpp b/test/test_zip_algorithms.cpp
@@ -8,6 +8,7 @@
 #include <algorithm>
 #include <array>
 #include <string_view>
+#include <tuple>
 
 #include "test_utils.hpp"