| ... |
... |
@@ -53,8 +53,10 @@ variables: |
|
53
|
53
|
#- bin/cross-build-world.sh -crl -B boot-2020-04-1 xtarget xcross src/tools/cross-scripts/cross-x86-x86.lisp snapshot/bin/lisp
|
|
54
|
54
|
# Regular build using the cross-compiled result or snapshot. The
|
|
55
|
55
|
# analyzer job requires gcc, so make sure we build with gcc here
|
|
56
|
|
- # instead of clang.
|
|
57
|
|
- - bin/build.sh $bootstrap -b build -R -C "" -o snapshot/bin/lisp
|
|
|
56
|
+ # instead of clang.
|
|
|
57
|
+ #
|
|
|
58
|
+ # Set CONFIG in appropriately each build.
|
|
|
59
|
+ - bin/build.sh $bootstrap -b build -R -C $CONFIG -o snapshot/bin/lisp
|
|
58
|
60
|
# When the result of `git describe` cannot be used as a version
|
|
59
|
61
|
# string, an alternative can be provided with the -V flag
|
|
60
|
62
|
# The following stages need this to run tests and such.
|
| ... |
... |
@@ -144,6 +146,8 @@ linux:build: |
|
144
|
146
|
needs:
|
|
145
|
147
|
- job: linux:install
|
|
146
|
148
|
artifacts: true
|
|
|
149
|
+ variables:
|
|
|
150
|
+ CONFIG: "x86_linux_clang"
|
|
147
|
151
|
# These rules is needed so that the static analyzer job can run on a
|
|
148
|
152
|
# schedule because this is a prerequisite of the analyzer build. A
|
|
149
|
153
|
# regular push or merge request does the normal stuff.
|
| ... |
... |
@@ -165,6 +169,10 @@ linux:cross-build: |
|
165
|
169
|
- linux-4/*.log
|
|
166
|
170
|
# The lisp directory is needed for the static analyzer job.
|
|
167
|
171
|
- linux-4/lisp
|
|
|
172
|
+ variables:
|
|
|
173
|
+ # This must match the config used for the linux build!
|
|
|
174
|
+ CONFIG: "x86_linux_clang"
|
|
|
175
|
+
|
|
168
|
176
|
needs:
|
|
169
|
177
|
|
|
170
|
178
|
# Normally need the linux:install stage to get the compiler to
|
| ... |
... |
@@ -178,7 +186,7 @@ linux:cross-build: |
|
178
|
186
|
- bin/create-target.sh xtarget
|
|
179
|
187
|
- bin/create-target.sh xcross
|
|
180
|
188
|
- bin/cross-build-world.sh -crl xtarget xcross src/tools/cross-scripts/cross-x86-x86.lisp dist/bin/lisp
|
|
181
|
|
- - bin/build.sh -b xlinux $bootstrap -R -C "" -o "xtarget/lisp/lisp -lib xtarget/lisp"
|
|
|
189
|
+ - bin/build.sh -b xlinux $bootstrap -R -C $CONFIG -o "xtarget/lisp/lisp -lib xtarget/lisp"
|
|
182
|
190
|
- bin/make-dist.sh -I xdist xlinux-4
|
|
183
|
191
|
|
|
184
|
192
|
linux:test:
|
| ... |
... |
@@ -248,6 +256,8 @@ osx:build: |
|
248
|
256
|
needs:
|
|
249
|
257
|
- job: osx:install
|
|
250
|
258
|
artifacts: true
|
|
|
259
|
+ variables:
|
|
|
260
|
+ CONFIG: ""
|
|
251
|
261
|
|
|
252
|
262
|
osx:test:
|
|
253
|
263
|
<<: *unit_test_configuration
|
| ... |
... |
@@ -335,6 +345,8 @@ ubuntu:build: |
|
335
|
345
|
needs:
|
|
336
|
346
|
- job: ubuntu:install
|
|
337
|
347
|
artifacts: true
|
|
|
348
|
+ variables:
|
|
|
349
|
+ CONFIG: "x86_linux_clang"
|
|
338
|
350
|
|
|
339
|
351
|
ubuntu:test:
|
|
340
|
352
|
<<: *unit_test_configuration
|