Skip to content

Commit cb086a0

Browse files
committed
Updated pipelines, adding both macOS compilers
A slight rework, instead of doing just the clang compiler, also uses the symbolic frontend of gcc, just in case.
1 parent d0e28cb commit cb086a0

File tree

1 file changed

+23
-9
lines changed

1 file changed

+23
-9
lines changed

.gitlab-ci.yml

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,24 @@ variables:
2929
- echo 'Copy-Item C:\workdir\* -Destination C:\workdir-cpy -Recurse' | out-file -encoding utf8 -append build.ps1
3030
- echo 'cd workdir-cpy' | out-file -encoding utf8 -append build.ps1
3131
- echo 'mkdir build; cd build' | out-file -encoding utf8 -append build.ps1
32-
- echo "cmake .. -GNinja" | out-file -encoding utf8 -append build.ps1
32+
- echo "cmake .. -GNinja -DCMAKE_BUILD_TYPE=Release" | out-file -encoding utf8 -append build.ps1
3333
- echo 'if(-not $?){throw}' | out-file -encoding utf8 -append build.ps1
3434
- echo 'ninja' | out-file -encoding utf8 -append build.ps1
3535
- echo 'if(-not $?){throw}' | out-file -encoding utf8 -append build.ps1
3636
- echo '} catch { exit 1 }' | out-file -encoding utf8 -append build.ps1
3737
- docker run --rm -v ${pwd}:C:\workdir $env:IMAGE C:\workdir\build.ps1
3838

39+
.platform_macos_template: &platform_macos_template
40+
stage: Platform Tests
41+
tags:
42+
- macos
43+
dependencies: []
44+
script:
45+
- mkdir build && cd build
46+
- cmake .. -GNinja -DCMAKE_BUILD_TYPE=Release
47+
- ninja
48+
- ctest
49+
3950
Fedora/GCC:
4051
image: stabletec/build-core:fedora-gcc
4152
<<: *platform_unix_template
@@ -78,14 +89,17 @@ Windows/Clang-cl:
7889
IMAGE: stabletec/build-core:windows-clang-cl
7990
<<: *platform_windows_template
8091

81-
MacOS/Clang:
82-
stage: Platform Tests
83-
tags:
84-
- macos
85-
script:
86-
- mkdir build && cd build
87-
- cmake .. -GNinja -DCMAKE_BUILD_TYPE=Release
88-
- ninja
92+
macOS/GCC:
93+
variables:
94+
CC: gcc
95+
CXX: g++
96+
<<: *platform_macos_template
97+
98+
macOS/Clang:
99+
variables:
100+
CC: clang
101+
CXX: clang++
102+
<<: *platform_macos_template
89103

90104
# Analysis #
91105

0 commit comments

Comments
 (0)