Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 9249eca

Browse filesBrowse files
StableCoderStableCoder
committed
Updated CI jobs
The creation and changing into the build directory is no longer an explicit step, isntead using CMake to create the files in the build directory then running ninja in the build directory instead. Fixed case where the Clang/Static builds were actually built as shared binaries.
1 parent 1d4bcb4 commit 9249eca
Copy full SHA for 9249eca

File tree

Expand file treeCollapse file tree

1 file changed

+45
-59
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+45
-59
lines changed

‎.gitlab-ci.yml

Copy file name to clipboardExpand all lines: .gitlab-ci.yml
+45-59Lines changed: 45 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,9 @@ Targeted CC GCC Static:
4949
CC: gcc
5050
CXX: g++
5151
script:
52-
- mkdir build && cd build
53-
- cmake ../example/code-coverage-target/ -GNinja -DCMAKE_BUILD_TYPE=Release -DCODE_COVERAGE=ON ${CMAKE_OPTIONS}
54-
- ninja
55-
- ninja ccov
52+
- cmake example/code-coverage-target/ -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCODE_COVERAGE=ON ${CMAKE_OPTIONS}
53+
- ninja -C build
54+
- ninja -C build ccov
5655

5756
Targeted CC GCC Shared:
5857
image: stabletec/build-core:fedora
@@ -65,10 +64,9 @@ Targeted CC GCC Shared:
6564
CXX: g++
6665
CMAKE_OPTIONS: -DBUILD_SHARED_LIBS=ON
6766
script:
68-
- mkdir build && cd build
69-
- cmake ../example/code-coverage-target/ -GNinja -DCMAKE_BUILD_TYPE=Release -DCODE_COVERAGE=ON ${CMAKE_OPTIONS}
70-
- ninja
71-
- ninja ccov
67+
- cmake example/code-coverage-target/ -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCODE_COVERAGE=ON ${CMAKE_OPTIONS}
68+
- ninja -C build
69+
- ninja -C build ccov
7270

7371
Targeted CC Clang Static:
7472
image: stabletec/build-core:fedora
@@ -79,13 +77,11 @@ Targeted CC Clang Static:
7977
variables:
8078
CC: clang
8179
CXX: clang++
82-
CMAKE_OPTIONS: -DBUILD_SHARED_LIBS=ON
8380
script:
84-
- mkdir build && cd build
85-
- cmake ../example/code-coverage-target/ -GNinja -DCMAKE_BUILD_TYPE=Release -DCODE_COVERAGE=ON ${CMAKE_OPTIONS}
86-
- ninja
87-
- ninja ccov
88-
- ninja ccov-report
81+
- cmake example/code-coverage-target/ -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCODE_COVERAGE=ON ${CMAKE_OPTIONS}
82+
- ninja -C build
83+
- ninja -C build ccov
84+
- ninja -C build ccov-report
8985

9086
Targeted CC Clang Shared:
9187
image: stabletec/build-core:fedora
@@ -98,11 +94,10 @@ Targeted CC Clang Shared:
9894
CXX: clang++
9995
CMAKE_OPTIONS: -DBUILD_SHARED_LIBS=ON
10096
script:
101-
- mkdir build && cd build
102-
- cmake ../example/code-coverage-target/ -GNinja -DCMAKE_BUILD_TYPE=Release -DCODE_COVERAGE=ON ${CMAKE_OPTIONS}
103-
- ninja
104-
- ninja ccov
105-
- ninja ccov-report
97+
- cmake example/code-coverage-target/ -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCODE_COVERAGE=ON ${CMAKE_OPTIONS}
98+
- ninja -C build
99+
- ninja -C build ccov
100+
- ninja -C build ccov-report
106101

107102
# All Code Coverage
108103

@@ -116,11 +111,10 @@ All CC GCC Static:
116111
CC: gcc
117112
CXX: g++
118113
script:
119-
- mkdir build && cd build
120-
- cmake ../example/code-coverage-all/ -GNinja -DCMAKE_BUILD_TYPE=Release -DCODE_COVERAGE=ON ${CMAKE_OPTIONS}
121-
- ninja
122-
- ninja ccov
123-
- ninja ccov-all
114+
- cmake example/code-coverage-all/ -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCODE_COVERAGE=ON ${CMAKE_OPTIONS}
115+
- ninja -C build
116+
- ninja -C build ccov
117+
- ninja -C build ccov-all
124118

125119
All CC GCC Shared:
126120
image: stabletec/build-core:fedora
@@ -133,11 +127,10 @@ All CC GCC Shared:
133127
CXX: g++
134128
CMAKE_OPTIONS: -DBUILD_SHARED_LIBS=ON
135129
script:
136-
- mkdir build && cd build
137-
- cmake ../example/code-coverage-all/ -GNinja -DCMAKE_BUILD_TYPE=Release -DCODE_COVERAGE=ON ${CMAKE_OPTIONS}
138-
- ninja
139-
- ninja ccov
140-
- ninja ccov-all
130+
- cmake example/code-coverage-all/ -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCODE_COVERAGE=ON ${CMAKE_OPTIONS}
131+
- ninja -C build
132+
- ninja -C build ccov
133+
- ninja -C build ccov-all
141134

142135
All CC Clang Static:
143136
image: stabletec/build-core:fedora
@@ -149,13 +142,11 @@ All CC Clang Static:
149142
CC: clang
150143
CXX: clang++
151144
script:
152-
- mkdir build && cd build
153-
- cmake ../example/code-coverage-all/ -GNinja -DCMAKE_BUILD_TYPE=Release -DCODE_COVERAGE=ON ${CMAKE_OPTIONS}
154-
- ninja
155-
- ninja
156-
- ninja ccov-all
157-
- ninja ccov-report
158-
- ninja ccov-all-report
145+
- cmake example/code-coverage-all/ -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCODE_COVERAGE=ON ${CMAKE_OPTIONS}
146+
- ninja -C build
147+
- ninja -C build ccov-all
148+
- ninja -C build ccov-report
149+
- ninja -C build ccov-all-report
159150

160151
All CC Clang Shared:
161152
image: stabletec/build-core:fedora
@@ -168,13 +159,12 @@ All CC Clang Shared:
168159
CXX: clang++
169160
CMAKE_OPTIONS: -DBUILD_SHARED_LIBS=ON
170161
script:
171-
- mkdir build && cd build
172-
- cmake ../example/code-coverage-all/ -GNinja -DCMAKE_BUILD_TYPE=Release -DCODE_COVERAGE=ON ${CMAKE_OPTIONS}
173-
- ninja
174-
- ninja ccov
175-
- ninja ccov-all
176-
- ninja ccov-report
177-
- ninja ccov-all-report
162+
- cmake example/code-coverage-all/ -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCODE_COVERAGE=ON ${CMAKE_OPTIONS}
163+
- ninja -C build
164+
- ninja -C build ccov
165+
- ninja -C build ccov-all
166+
- ninja -C build ccov-report
167+
- ninja -C build ccov-all-report
178168

179169
# Fedora
180170

@@ -185,10 +175,9 @@ All CC Clang Shared:
185175
- docker-linux
186176
- amd64
187177
script:
188-
- mkdir build && cd build
189-
- cmake ../example/all -GNinja -DCMAKE_BUILD_TYPE=Release ${CMAKE_OPTIONS}
190-
- ninja
191-
- ninja test
178+
- cmake example/all -B build -GNinja -DCMAKE_BUILD_TYPE=Release ${CMAKE_OPTIONS}
179+
- ninja -C build
180+
- ninja -C build test
192181

193182
.fedora_failure_template: &fedora_failure_template
194183
stage: Fedora
@@ -197,10 +186,9 @@ All CC Clang Shared:
197186
- docker-linux
198187
- amd64
199188
script:
200-
- mkdir build && cd build
201-
- cmake ../example/all -GNinja -DCMAKE_BUILD_TYPE=Release ${CMAKE_OPTIONS}
202-
- ninja
203-
- "! ninja test"
189+
- cmake example/all -B build -GNinja -DCMAKE_BUILD_TYPE=Release ${CMAKE_OPTIONS}
190+
- ninja -C build
191+
- "! ninja -C build test"
204192

205193
Fedora Static Analysis:
206194
variables:
@@ -246,21 +234,19 @@ Fedora UndefinedSanitizer:
246234
- docker-linux
247235
- amd64
248236
script:
249-
- mkdir build && cd build
250-
- cmake ../example/all -GNinja -DCMAKE_BUILD_TYPE=Release ${CMAKE_OPTIONS}
251-
- ninja
252-
- ninja test
237+
- cmake example/all -B build -GNinja -DCMAKE_BUILD_TYPE=Release ${CMAKE_OPTIONS}
238+
- ninja -C build
239+
- ninja -C build test
253240

254241
.opensuse_failure_template: &opensuse_failure_template
255242
stage: openSUSE
256243
image: stabletec/build-core:opensuse
257244
tags:
258245
- docker-linux
259246
script:
260-
- mkdir build && cd build
261-
- cmake ../example/all -GNinja -DCMAKE_BUILD_TYPE=Release ${CMAKE_OPTIONS}
262-
- ninja
263-
- "! ninja test"
247+
- cmake example/all -B build -GNinja -DCMAKE_BUILD_TYPE=Release ${CMAKE_OPTIONS}
248+
- ninja -C build
249+
- "! ninja -C build test"
264250

265251
openSUSE Static Analysis:
266252
variables:

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.