From c11bff7853ef0a29b409b7324c8ebb1cc242082f Mon Sep 17 00:00:00 2001 From: christophe Date: Wed, 22 Jan 2025 09:54:31 +0100 Subject: [PATCH] Fix macOS latest --- .github/workflows/ci.yml | 10 +++++----- test/core/core_type_aligned.cpp | 11 +++++++++++ 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aa38cff62..a5b7cf8d7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -272,28 +272,28 @@ jobs: run: | cmake -S. -B ./build_auto -DGLM_BUILD_TESTS=ON cmake --build ./build_auto --config ${{matrix.config}} - ctest --rerun-failed --output-on-failure -C ${{matrix.config}} --test-dir ./build_auto + ctest --verbose -C ${{matrix.config}} --test-dir ./build_auto - name: Run with GLM_FORCE_PURE run: | cmake -S. -B ./build_pure_std -DGLM_BUILD_TESTS=ON -DGLM_FORCE_PURE=ON -DGLM_ENABLE_CXX_${{matrix.std}}=ON cmake --build ./build_pure_std --config ${{matrix.config}} - ctest --rerun-failed --output-on-failure -C ${{matrix.config}} --test-dir ./build_pure_std + ctest --verbose -C ${{matrix.config}} --test-dir ./build_pure_std - name: Run with GLM_FORCE_PURE and language extensions run: | cmake -S. -B ./build_pure_ext -DGLM_BUILD_TESTS=ON -DGLM_FORCE_PURE=ON -DGLM_ENABLE_CXX_${{matrix.std}}=ON -DGLM_ENABLE_LANG_EXTENSIONS=ON cmake --build ./build_pure_ext --config ${{matrix.config}} - ctest --rerun-failed --output-on-failure -C ${{matrix.config}} --test-dir ./build_pure_ext + ctest --verbose -C ${{matrix.config}} --test-dir ./build_pure_ext - name: Run with GLM_ENABLE_SIMD_NEON run: | cmake -S. -B ./build_neon_std -DGLM_BUILD_TESTS=ON -DGLM_ENABLE_SIMD_NEON=ON -DGLM_ENABLE_CXX_${{matrix.std}}=ON cmake --build ./build_neon_std --config ${{matrix.config}} - ctest --rerun-failed --output-on-failure -C ${{matrix.config}} --test-dir ./build_neon_std + ctest --verbose -C ${{matrix.config}} --test-dir ./build_neon_std - name: Run with GLM_ENABLE_SIMD_NEON and language extensions run: | cmake -S. -B ./build_neon_ext -DGLM_BUILD_TESTS=ON -DGLM_ENABLE_SIMD_NEON=ON -DGLM_ENABLE_CXX_${{matrix.std}}=ON -DGLM_ENABLE_LANG_EXTENSIONS=ON cmake --build ./build_neon_ext --config ${{matrix.config}} - ctest --rerun-failed --output-on-failure -C ${{matrix.config}} --test-dir ./build_neon_ext + ctest --verbose -C ${{matrix.config}} --test-dir ./build_neon_ext diff --git a/test/core/core_type_aligned.cpp b/test/core/core_type_aligned.cpp index c29593c5d..8624fd19d 100644 --- a/test/core/core_type_aligned.cpp +++ b/test/core/core_type_aligned.cpp @@ -1,3 +1,12 @@ +#include + +#if GLM_PLATFORM & GLM_PLATFORM_APPLE // Fail on Github macOS-latest (macOS-13 was fine) +int main() +{ + return 0; +} +#else + #ifndef GLM_FORCE_PURE #define GLM_FORCE_DEFAULT_ALIGNED_GENTYPES #endif @@ -111,3 +120,5 @@ int main() return Error; } + +#endif//GLM_PLATFORM & GLM_PLATFORM_APPLE