Skip to content

Commit feb068e

Browse files
committed
Update CI jobs
Modernized, added new tests for Windows/Clang, macOS/AppleClang, and MSYS.
1 parent 9fea755 commit feb068e

File tree

1 file changed

+56
-18
lines changed

1 file changed

+56
-18
lines changed

.gitlab-ci.yml

Lines changed: 56 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,38 +6,52 @@ stages:
66

77
variables:
88
GIT_SUBMODULE_STRATEGY: recursive
9-
CTEST_OUTPUT_ON_FAILURE: '1'
109

1110
# Platform Tests #
1211

1312
.platform_unix_template: &platform_unix_template
1413
stage: Platform Tests
1514
tags:
16-
- docker-linux
15+
- container
16+
- linux
17+
- amd64
1718
script:
18-
- mkdir build && cd build
19-
- cmake .. -GNinja -DCMAKE_BUILD_TYPE=Release
20-
- ninja
19+
- cmake . -B build -G Ninja
20+
- cmake --build build
2121

2222
.platform_windows_template: &platform_windows_template
2323
stage: Platform Tests
24-
image: stabletec/build-core:windows
24+
image: stabletec/build-core:windows-ltsc2022
2525
tags:
26-
- docker-windows
26+
- container
27+
- windows
28+
- ltsc2022
29+
- amd64
2730
script:
28-
- mkdir build; cd build
29-
- cmake .. -GNinja -DCMAKE_BUILD_TYPE=Release
30-
- ninja
31+
- cmake . -B build -G Ninja
32+
- cmake --build build
33+
34+
.platform_msys_template: &platform_msys_template
35+
stage: Platform Tests
36+
image: stabletec/build-core:msys-ltsc2022-${MSYS_SUBSYSTEM}
37+
tags:
38+
- container
39+
- windows
40+
- ltsc2022
41+
- amd64
42+
script:
43+
# set the directory bash will start in
44+
- $env:HOME="$(cygpath -u $(pwd))"
45+
- bash.exe -lc "cmake . -B build -G Ninja"
46+
- bash.exe -lc 'cmake --build build'
3147

3248
.platform_macos_template: &platform_macos_template
3349
stage: Platform Tests
3450
tags:
3551
- macos
36-
dependencies: []
3752
script:
38-
- mkdir build && cd build
39-
- cmake .. -GNinja -DCMAKE_BUILD_TYPE=Release
40-
- ninja
53+
- cmake . -B build -G Ninja
54+
- cmake --build build
4155

4256
Fedora/GCC:
4357
image: stabletec/build-core:fedora
@@ -104,6 +118,30 @@ Windows/Clang-cl:
104118
CXX: clang-cl
105119
<<: *platform_windows_template
106120

121+
Windows/Clang:
122+
variables:
123+
CC: clang
124+
CXX: clang
125+
<<: *platform_windows_template
126+
127+
MSYS/GCC:
128+
parallel:
129+
matrix:
130+
- MSYS_SUBSYSTEM: [ucrt64, mingw64]
131+
<<: *platform_windows_template
132+
133+
MSYS/Clang:
134+
parallel:
135+
matrix:
136+
- MSYS_SUBSYSTEM: [ucrt64, mingw64, clang64]
137+
<<: *platform_windows_template
138+
139+
macOS/AppleClang:
140+
variables:
141+
CC: clang
142+
CXX: clang++
143+
<<: *platform_macos_template
144+
107145
macOS/Clang:
108146
variables:
109147
CC: clang
@@ -116,11 +154,11 @@ macOS/Clang:
116154
stage: Analysis
117155
image: stabletec/build-foe:fedora
118156
tags:
119-
- docker-linux
157+
- container
158+
- linux
120159
script:
121-
- mkdir build && cd build
122-
- cmake .. -GNinja -DCMAKE_BUILD_TYPE=Release ${CMAKE_OPTIONS}
123-
- ninja
160+
- cmake . -B build -G Ninja
161+
- cmake --build build
124162

125163
Static Analysis:
126164
variables:

0 commit comments

Comments
 (0)