Skip to content

Commit c11bff7

Browse files
author
christophe
committed
Fix macOS latest
1 parent fe26a52 commit c11bff7

File tree

2 files changed

+16
-5
lines changed

2 files changed

+16
-5
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -272,28 +272,28 @@ jobs:
272272
run: |
273273
cmake -S. -B ./build_auto -DGLM_BUILD_TESTS=ON
274274
cmake --build ./build_auto --config ${{matrix.config}}
275-
ctest --rerun-failed --output-on-failure -C ${{matrix.config}} --test-dir ./build_auto
275+
ctest --verbose -C ${{matrix.config}} --test-dir ./build_auto
276276
277277
- name: Run with GLM_FORCE_PURE
278278
run: |
279279
cmake -S. -B ./build_pure_std -DGLM_BUILD_TESTS=ON -DGLM_FORCE_PURE=ON -DGLM_ENABLE_CXX_${{matrix.std}}=ON
280280
cmake --build ./build_pure_std --config ${{matrix.config}}
281-
ctest --rerun-failed --output-on-failure -C ${{matrix.config}} --test-dir ./build_pure_std
281+
ctest --verbose -C ${{matrix.config}} --test-dir ./build_pure_std
282282
- name: Run with GLM_FORCE_PURE and language extensions
283283
run: |
284284
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
285285
cmake --build ./build_pure_ext --config ${{matrix.config}}
286-
ctest --rerun-failed --output-on-failure -C ${{matrix.config}} --test-dir ./build_pure_ext
286+
ctest --verbose -C ${{matrix.config}} --test-dir ./build_pure_ext
287287
288288
- name: Run with GLM_ENABLE_SIMD_NEON
289289
run: |
290290
cmake -S. -B ./build_neon_std -DGLM_BUILD_TESTS=ON -DGLM_ENABLE_SIMD_NEON=ON -DGLM_ENABLE_CXX_${{matrix.std}}=ON
291291
cmake --build ./build_neon_std --config ${{matrix.config}}
292-
ctest --rerun-failed --output-on-failure -C ${{matrix.config}} --test-dir ./build_neon_std
292+
ctest --verbose -C ${{matrix.config}} --test-dir ./build_neon_std
293293
- name: Run with GLM_ENABLE_SIMD_NEON and language extensions
294294
run: |
295295
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
296296
cmake --build ./build_neon_ext --config ${{matrix.config}}
297-
ctest --rerun-failed --output-on-failure -C ${{matrix.config}} --test-dir ./build_neon_ext
297+
ctest --verbose -C ${{matrix.config}} --test-dir ./build_neon_ext
298298
299299

test/core/core_type_aligned.cpp

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
#include <glm/detail/setup.hpp>
2+
3+
#if GLM_PLATFORM & GLM_PLATFORM_APPLE // Fail on Github macOS-latest (macOS-13 was fine)
4+
int main()
5+
{
6+
return 0;
7+
}
8+
#else
9+
110
#ifndef GLM_FORCE_PURE
211
#define GLM_FORCE_DEFAULT_ALIGNED_GENTYPES
312
#endif
@@ -111,3 +120,5 @@ int main()
111120

112121
return Error;
113122
}
123+
124+
#endif//GLM_PLATFORM & GLM_PLATFORM_APPLE

0 commit comments

Comments
 (0)