Skip to content

Commit 34e3aff

Browse files
StableCoderStableCoder
committed
Updated CI jobs for new Docker images
The images the jobs are based off of have been modified to be more general, requiring specifying the compilers as environment variables instead.
1 parent 8e52aee commit 34e3aff

File tree

1 file changed

+74
-22
lines changed

1 file changed

+74
-22
lines changed

‎.gitlab-ci.yml‎

Lines changed: 74 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ variables:
1313
cmake-format Check:
1414
image: stabletec/build-core:fedora
1515
stage: Analysis
16-
tags:
16+
tags:
1717
- docker-linux
1818
allow_failure: true
1919
script:
@@ -26,7 +26,7 @@ cmake-format Check:
2626
clang-format Check:
2727
image: stabletec/build-core:fedora
2828
stage: Analysis
29-
tags:
29+
tags:
3030
- docker-linux
3131
allow_failure: true
3232
script:
@@ -40,34 +40,46 @@ clang-format Check:
4040
# Targeted Code Coverage
4141

4242
Targeted CC GCC Static:
43-
image: stabletec/build-core:fedora-gcc
43+
image: stabletec/build-core:fedora
4444
stage: Targeted Code Coverage
4545
tags:
4646
- docker-linux
47+
- amd64
48+
variables:
49+
CC: gcc
50+
CXX: g++
4751
script:
4852
- mkdir build && cd build
4953
- cmake ../example/code-coverage-target/ -GNinja -DCMAKE_BUILD_TYPE=Release -DCODE_COVERAGE=ON ${CMAKE_OPTIONS}
5054
- ninja
5155
- ninja ccov
5256

5357
Targeted CC GCC Shared:
54-
image: stabletec/build-core:fedora-gcc
55-
variables:
56-
CMAKE_OPTIONS: -DBUILD_SHARED_LIBS=ON
58+
image: stabletec/build-core:fedora
5759
stage: Targeted Code Coverage
5860
tags:
5961
- docker-linux
62+
- amd64
63+
variables:
64+
CC: gcc
65+
CXX: g++
66+
CMAKE_OPTIONS: -DBUILD_SHARED_LIBS=ON
6067
script:
6168
- mkdir build && cd build
6269
- cmake ../example/code-coverage-target/ -GNinja -DCMAKE_BUILD_TYPE=Release -DCODE_COVERAGE=ON ${CMAKE_OPTIONS}
6370
- ninja
6471
- ninja ccov
6572

6673
Targeted CC Clang Static:
67-
image: stabletec/build-core:fedora-clang
74+
image: stabletec/build-core:fedora
6875
stage: Targeted Code Coverage
6976
tags:
7077
- docker-linux
78+
- amd64
79+
variables:
80+
CC: clang
81+
CXX: clang++
82+
CMAKE_OPTIONS: -DBUILD_SHARED_LIBS=ON
7183
script:
7284
- mkdir build && cd build
7385
- cmake ../example/code-coverage-target/ -GNinja -DCMAKE_BUILD_TYPE=Release -DCODE_COVERAGE=ON ${CMAKE_OPTIONS}
@@ -76,12 +88,15 @@ Targeted CC Clang Static:
7688
- ninja ccov-report
7789

7890
Targeted CC Clang Shared:
79-
image: stabletec/build-core:fedora-clang
80-
variables:
81-
CMAKE_OPTIONS: -DBUILD_SHARED_LIBS=ON
91+
image: stabletec/build-core:fedora
8292
stage: Targeted Code Coverage
8393
tags:
8494
- docker-linux
95+
- amd64
96+
variables:
97+
CC: clang
98+
CXX: clang++
99+
CMAKE_OPTIONS: -DBUILD_SHARED_LIBS=ON
85100
script:
86101
- mkdir build && cd build
87102
- cmake ../example/code-coverage-target/ -GNinja -DCMAKE_BUILD_TYPE=Release -DCODE_COVERAGE=ON ${CMAKE_OPTIONS}
@@ -92,10 +107,14 @@ Targeted CC Clang Shared:
92107
# All Code Coverage
93108

94109
All CC GCC Static:
95-
image: stabletec/build-core:fedora-gcc
110+
image: stabletec/build-core:fedora
96111
stage: All Code Coverage
97112
tags:
98113
- docker-linux
114+
- amd64
115+
variables:
116+
CC: gcc
117+
CXX: g++
99118
script:
100119
- mkdir build && cd build
101120
- cmake ../example/code-coverage-all/ -GNinja -DCMAKE_BUILD_TYPE=Release -DCODE_COVERAGE=ON ${CMAKE_OPTIONS}
@@ -104,12 +123,15 @@ All CC GCC Static:
104123
- ninja ccov-all
105124

106125
All CC GCC Shared:
107-
image: stabletec/build-core:fedora-gcc
108-
variables:
109-
CMAKE_OPTIONS: -DBUILD_SHARED_LIBS=ON
126+
image: stabletec/build-core:fedora
110127
stage: All Code Coverage
111128
tags:
112129
- docker-linux
130+
- amd64
131+
variables:
132+
CC: gcc
133+
CXX: g++
134+
CMAKE_OPTIONS: -DBUILD_SHARED_LIBS=ON
113135
script:
114136
- mkdir build && cd build
115137
- cmake ../example/code-coverage-all/ -GNinja -DCMAKE_BUILD_TYPE=Release -DCODE_COVERAGE=ON ${CMAKE_OPTIONS}
@@ -118,10 +140,14 @@ All CC GCC Shared:
118140
- ninja ccov-all
119141

120142
All CC Clang Static:
121-
image: stabletec/build-core:fedora-clang
143+
image: stabletec/build-core:fedora
122144
stage: All Code Coverage
123145
tags:
124146
- docker-linux
147+
- amd64
148+
variables:
149+
CC: clang
150+
CXX: clang++
125151
script:
126152
- mkdir build && cd build
127153
- cmake ../example/code-coverage-all/ -GNinja -DCMAKE_BUILD_TYPE=Release -DCODE_COVERAGE=ON ${CMAKE_OPTIONS}
@@ -132,12 +158,15 @@ All CC Clang Static:
132158
- ninja ccov-all-report
133159

134160
All CC Clang Shared:
135-
image: stabletec/build-core:fedora-clang
136-
variables:
137-
CMAKE_OPTIONS: -DBUILD_SHARED_LIBS=ON
161+
image: stabletec/build-core:fedora
138162
stage: All Code Coverage
139163
tags:
140164
- docker-linux
165+
- amd64
166+
variables:
167+
CC: clang
168+
CXX: clang++
169+
CMAKE_OPTIONS: -DBUILD_SHARED_LIBS=ON
141170
script:
142171
- mkdir build && cd build
143172
- cmake ../example/code-coverage-all/ -GNinja -DCMAKE_BUILD_TYPE=Release -DCODE_COVERAGE=ON ${CMAKE_OPTIONS}
@@ -151,9 +180,10 @@ All CC Clang Shared:
151180

152181
.fedora_success_template: &fedora_success_template
153182
stage: Fedora
154-
image: stabletec/build-core:fedora-clang
183+
image: stabletec/build-core:fedora
155184
tags:
156185
- docker-linux
186+
- amd64
157187
script:
158188
- mkdir build && cd build
159189
- cmake ../example/all -GNinja -DCMAKE_BUILD_TYPE=Release ${CMAKE_OPTIONS}
@@ -162,9 +192,10 @@ All CC Clang Shared:
162192

163193
.fedora_failure_template: &fedora_failure_template
164194
stage: Fedora
165-
image: stabletec/build-core:fedora-clang
195+
image: stabletec/build-core:fedora
166196
tags:
167197
- docker-linux
198+
- amd64
168199
script:
169200
- mkdir build && cd build
170201
- cmake ../example/all -GNinja -DCMAKE_BUILD_TYPE=Release ${CMAKE_OPTIONS}
@@ -173,36 +204,47 @@ All CC Clang Shared:
173204

174205
Fedora Static Analysis:
175206
variables:
207+
CC: clang
208+
CXX: clang++
176209
CMAKE_OPTIONS: -DCLANG_TIDY=ON -DCPPCHECK=ON
177210
<<: *fedora_success_template
178211

179212
Fedora ThreadSanitizer:
180213
variables:
214+
CC: clang
215+
CXX: clang++
181216
CMAKE_OPTIONS: -DUSE_SANITIZER=Thread
182217
<<: *fedora_failure_template
183218

184219
Fedora AddressSanitizer:
185220
variables:
221+
CC: clang
222+
CXX: clang++
186223
CMAKE_OPTIONS: -DUSE_SANITIZER=Address
187224
<<: *fedora_failure_template
188225

189226
Fedora LeakSanitizer:
190227
variables:
228+
CC: clang
229+
CXX: clang++
191230
CMAKE_OPTIONS: -DUSE_SANITIZER=Leak
192231
<<: *fedora_failure_template
193232

194233
Fedora UndefinedSanitizer:
195234
variables:
235+
CC: clang
236+
CXX: clang++
196237
CMAKE_OPTIONS: -DUSE_SANITIZER=Undefined
197238
<<: *fedora_success_template
198239

199240
# openSUSE
200241

201242
.opensuse_success_template: &opensuse_success_template
202243
stage: openSUSE
203-
image: stabletec/build-core:opensuse-clang
244+
image: stabletec/build-core:opensuse
204245
tags:
205246
- docker-linux
247+
- amd64
206248
script:
207249
- mkdir build && cd build
208250
- cmake ../example/all -GNinja -DCMAKE_BUILD_TYPE=Release ${CMAKE_OPTIONS}
@@ -211,7 +253,7 @@ Fedora UndefinedSanitizer:
211253

212254
.opensuse_failure_template: &opensuse_failure_template
213255
stage: openSUSE
214-
image: stabletec/build-core:opensuse-clang
256+
image: stabletec/build-core:opensuse
215257
tags:
216258
- docker-linux
217259
script:
@@ -222,25 +264,35 @@ Fedora UndefinedSanitizer:
222264

223265
openSUSE Static Analysis:
224266
variables:
267+
CC: clang
268+
CXX: clang++
225269
CMAKE_OPTIONS: -DCLANG_TIDY=ON -DCPPCHECK=ON
226270
<<: *opensuse_success_template
227271

228272
openSUSE ThreadSanitizer:
229273
variables:
274+
CC: clang
275+
CXX: clang++
230276
CMAKE_OPTIONS: -DUSE_SANITIZER=Thread
231277
<<: *opensuse_failure_template
232278

233279
openSUSE AddressSanitizer:
234280
variables:
281+
CC: clang
282+
CXX: clang++
235283
CMAKE_OPTIONS: -DUSE_SANITIZER=Address
236284
<<: *opensuse_failure_template
237285

238286
openSUSE LeakSanitizer:
239287
variables:
288+
CC: clang
289+
CXX: clang++
240290
CMAKE_OPTIONS: -DUSE_SANITIZER=Leak
241291
<<: *opensuse_failure_template
242292

243293
openSUSE UndefinedSanitizer:
244294
variables:
295+
CC: clang
296+
CXX: clang++
245297
CMAKE_OPTIONS: -DUSE_SANITIZER=Undefined
246298
<<: *opensuse_success_template

0 commit comments

Comments
 (0)