Skip to content

Commit dde1489

Browse files
committed
[CI] Remove Stdlib dep from mathcomp
Following math-comp/math-comp#1343
1 parent ec2f132 commit dde1489

File tree

5 files changed

+46
-21
lines changed

5 files changed

+46
-21
lines changed

.gitlab-ci.yml

+12-8
Original file line numberDiff line numberDiff line change
@@ -809,7 +809,6 @@ library:ci-oddorder:
809809
extends: .ci-template-flambda
810810
needs:
811811
- build:edge+flambda
812-
- library:ci-stdlib+flambda
813812
- plugin:ci-elpi_hb
814813
- library:ci-mathcomp
815814
stage: build-3+
@@ -818,7 +817,6 @@ library:ci-fourcolor:
818817
extends: .ci-template-flambda
819818
needs:
820819
- build:edge+flambda
821-
- library:ci-stdlib+flambda
822820
- plugin:ci-elpi_hb
823821
- library:ci-mathcomp
824822
stage: build-3+
@@ -856,15 +854,13 @@ library:ci-mathcomp:
856854
extends: .ci-template-flambda
857855
needs:
858856
- build:edge+flambda
859-
- library:ci-stdlib+flambda
860857
- plugin:ci-elpi_hb # for Hierarchy Builder
861858
stage: build-2
862859

863860
library:ci-mathcomp_test:
864861
extends: .ci-template-flambda
865862
needs:
866863
- build:edge+flambda
867-
- library:ci-stdlib+flambda
868864
- plugin:ci-elpi_hb
869865
- library:ci-mathcomp
870866
stage: build-3+
@@ -892,7 +888,6 @@ library:ci-finmap:
892888
extends: .ci-template-flambda
893889
needs:
894890
- build:edge+flambda
895-
- library:ci-stdlib+flambda
896891
- plugin:ci-elpi_hb
897892
- library:ci-mathcomp
898893
stage: build-3+
@@ -901,7 +896,6 @@ library:ci-bigenough:
901896
extends: .ci-template-flambda
902897
needs:
903898
- build:edge+flambda
904-
- library:ci-stdlib+flambda
905899
- plugin:ci-elpi_hb
906900
- library:ci-mathcomp
907901
stage: build-3+
@@ -910,13 +904,24 @@ library:ci-analysis:
910904
extends: .ci-template-flambda
911905
needs:
912906
- build:edge+flambda
913-
- library:ci-stdlib+flambda
914907
- library:ci-mathcomp
915908
- library:ci-finmap
916909
- library:ci-bigenough
917910
- plugin:ci-elpi_hb # for Hierarchy Builder
918911
stage: build-3+
919912

913+
library:ci-analysis_stdlib:
914+
extends: .ci-template-flambda
915+
needs:
916+
- build:edge+flambda
917+
- library:ci-mathcomp
918+
- library:ci-finmap
919+
- library:ci-bigenough
920+
- library:ci-analysis
921+
- plugin:ci-elpi_hb # for Hierarchy Builder
922+
- library:ci-stdlib+flambda
923+
stage: build-3+
924+
920925
library:ci-neural_net_interp:
921926
extends: .ci-template
922927
needs:
@@ -1119,7 +1124,6 @@ plugin:ci-elpi_hb:
11191124
extends: .ci-template-flambda
11201125
needs:
11211126
- build:edge+flambda
1122-
- library:ci-stdlib+flambda
11231127

11241128
plugin:ci-elpi_test:
11251129
extends: .ci-template-flambda

Makefile.ci

+9-8
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ CI_PLATFORM_FULL= \
3232
ci-finmap \
3333
ci-bigenough \
3434
ci-analysis \
35+
ci-analysis_stdlib \
3536
ci-menhir \
3637
ci-mtac2 \
3738
ci-paramcoq \
@@ -140,8 +141,8 @@ ci-lean_importer: ci-stdlib
140141
ci-mathcomp: ci-elpi_hb
141142

142143
ci-coqprime: ci-bignums
143-
ci-coquelicot: ci-mathcomp
144-
ci-deriving: ci-mathcomp
144+
ci-coquelicot: ci-mathcomp ci-stdlib
145+
ci-deriving: ci-mathcomp ci-stdlib
145146
ci-math_classes: ci-bignums
146147

147148
ci-coqhammer: ci-stdlib
@@ -172,22 +173,22 @@ ci-fiat_parsers: ci-stdlib
172173

173174
ci-fourcolor: ci-mathcomp
174175
ci-oddorder: ci-mathcomp
175-
ci-fcsl_pcm: ci-mathcomp
176-
ci-mczify: ci-mathcomp
176+
ci-fcsl_pcm: ci-mathcomp ci-stdlib
177+
ci-mczify: ci-mathcomp ci-stdlib
177178
ci-algebra_tactics: ci-mczify
178179
ci-mathcomp_test: ci-mathcomp
179-
ci-mathcomp_word: ci-mathcomp
180+
ci-mathcomp_word: ci-mathcomp ci-stdlib
180181
ci-finmap: ci-mathcomp
181182
ci-bigenough: ci-mathcomp
182183
ci-analysis: ci-elpi_hb ci-finmap ci-bigenough
184+
ci-analysis_stdlib: ci-analysis ci-stdlib
183185

184186
ci-hb: ci-elpi
185187

186-
ci-elpi: ci-stdlib
187-
ci-elpi_test: ci-elpi
188+
ci-elpi_test: ci-elpi ci-stdlib
188189
ci-hb_test: ci-hb
189190

190-
ci-trakt: ci-elpi
191+
ci-trakt: ci-elpi ci-stdlib
191192

192193
ci-engine_bench: ci-stdlib
193194

dev/ci/scripts/ci-analysis.sh

+8-2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ git_download analysis
1010
if [ "$DOWNLOAD_ONLY" ]; then exit 0; fi
1111

1212
( cd "${CI_BUILD_DIR}/analysis"
13-
make
14-
make install
13+
make -C classical
14+
make -C classical install
15+
make -C reals
16+
make -C reals install
17+
make -C theories
18+
make -C theories install
19+
make -C experimental_reals
20+
make -C experimental_reals install
1521
)

dev/ci/scripts/ci-analysis_stdlib.sh

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/usr/bin/env bash
2+
3+
set -e
4+
5+
ci_dir="$(dirname "$0")"
6+
. "${ci_dir}/ci-common.sh"
7+
8+
if [ "$DOWNLOAD_ONLY" ]; then exit 0; fi
9+
10+
( cd "${CI_BUILD_DIR}/analysis"
11+
make -C reals_stdlib
12+
make -C reals_stdlib install
13+
make -C analysis_stdlib
14+
make -C analysis_stdlib install
15+
)

dev/ci/scripts/ci-elpi_test.sh

+2-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ if [ "$DOWNLOAD_ONLY" ]; then exit 0; fi
99

1010
( cd "${CI_BUILD_DIR}/elpi"
1111
export DUNE_build_FLAGS="--release"
12-
make test-core
13-
make examples
14-
make test-apps
12+
make -j1 all-tests
13+
make -j1 all-examples
1514
)

0 commit comments

Comments
 (0)