Merge pull request #3287 from eseiler/infra/macos-14

[INFRA] Use macos-14
seqan · Sep 19, 2024 · d4a7c88 · d4a7c88
2 parents abcad13 + 655efb1
commit d4a7c88
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 2 deletions.
diff --git a/.github/workflows/ci_macos.yml b/.github/workflows/ci_macos.yml
@@ -28,7 +28,7 @@ defaults:
 jobs:
   build:
     name: ${{ matrix.compiler }}
-    runs-on: macos-12
+    runs-on: macos-14
     if: github.repository_owner == 'seqan' || github.event_name == 'workflow_dispatch' || github.event.label.name == 'lint'
     strategy:
       fail-fast: false

diff --git a/include/seqan3/utility/simd/detail/builtin_simd_intrinsics.hpp b/include/seqan3/utility/simd/detail/builtin_simd_intrinsics.hpp
@@ -17,7 +17,13 @@
 //
 // See the following link for a full description of the x86intrin.h header on powerpc
 // https://github.com/gcc-mirror/gcc/blob/41d6b10e96a1de98e90a7c0378437c3255814b16/gcc/config/rs6000/xmmintrin.h#L27-L55
-#if __has_include(<x86intrin.h>) && !(defined(__powerpc__) || defined(__ppc__) || defined(__PPC__))
+//
+// We also exclude clang with libc++ on any non-x86 platform.
+// `x86intrin.h` includes `immintrin.h`, which will error:
+// https://github.com/llvm/llvm-project/blob/9886788a8a500a1b429a6db64397c849b112251c/clang/lib/Headers/immintrin.h#L14
+#if __has_include(<x86intrin.h>) && \
+    !(defined(__powerpc__) || defined(__ppc__) || defined(__PPC__)) && \
+    !(defined(__clang__) && defined(_LIBCPP_VERSION) && !defined(__i386__) && !defined(__x86_64__))
 #    include <x86intrin.h> // x86 intrinsics (linux)
 #endif
 

diff --git a/test/seqan3-test.cmake b/test/seqan3-test.cmake
@@ -68,6 +68,13 @@ if (NOT TARGET seqan3::test)
         endif ()
     endif ()
 
+    # GCC on arm64 (M1): Disable notes about ABI changes. Example:
+    # `parameter passing for argument of type 'std::ranges::single_view<double>' when C++17 is enabled changed to match C++14 in GCC 10.1`
+    # https://github.com/gcc-mirror/gcc/commit/56fe3ca30e1343e4f232ca539726506440e23dd3
+    if ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "arm64" AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+        target_compile_options (seqan3_test INTERFACE "-Wno-psabi")
+    endif ()
+
     target_link_libraries (seqan3_test INTERFACE "seqan3::seqan3" "pthread")
     target_include_directories (seqan3_test INTERFACE "${SEQAN3_TEST_INCLUDE_DIR}")
     add_library (seqan3::test ALIAS seqan3_test)

diff --git a/test/unit/alphabet/container/debug_stream_container_of_container_test.cpp b/test/unit/alphabet/container/debug_stream_container_of_container_test.cpp
@@ -25,7 +25,15 @@ TYPED_TEST_SUITE(debug_stream_test, container_of_container_types, );
 
 TYPED_TEST(debug_stream_test, container_of_container)
 {
+#if SEQAN3_WORKAROUND_GCC_BOGUS_MEMCPY
+#    pragma GCC diagnostic push
+#    pragma GCC diagnostic ignored "-Warray-bounds"
+#    pragma GCC diagnostic ignored "-Wstringop-overflow"
+#endif // SEQAN3_WORKAROUND_GCC_BOGUS_MEMCPY
     TypeParam t1{"ACGT"_dna4, "ACGT"_dna4, "GAGGA"_dna4};
+#if SEQAN3_WORKAROUND_GCC_BOGUS_MEMCPY
+#    pragma GCC diagnostic pop
+#endif // SEQAN3_WORKAROUND_GCC_BOGUS_MEMCPY
 
     std::ostringstream o;
     seqan3::debug_stream_type my_stream{o};