Skip to content

Commit 3f9eacc

Browse files
proux01proux01
committed
[CI] Update Nix toolbox
1 parent dcf7714 commit 3f9eacc

File tree

4 files changed

+30
-25
lines changed

4 files changed

+30
-25
lines changed

‎.github/workflows/nix-action-rocq-9.1.yml‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2569,7 +2569,6 @@ jobs:
25692569
needs:
25702570
- coq
25712571
- mathcomp-reals
2572-
- mathcomp-bigenough
25732572
- hierarchy-builder
25742573
runs-on: ubuntu-latest
25752574
steps:
@@ -2627,10 +2626,6 @@ jobs:
26272626
name: 'Building/fetching previous CI target: mathcomp-reals'
26282627
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
26292628
"rocq-9.1" --argstr job "mathcomp-reals"
2630-
- if: steps.stepCheck.outputs.status != 'fetched'
2631-
name: 'Building/fetching previous CI target: mathcomp-bigenough'
2632-
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
2633-
"rocq-9.1" --argstr job "mathcomp-bigenough"
26342629
- if: steps.stepCheck.outputs.status != 'fetched'
26352630
name: 'Building/fetching previous CI target: hierarchy-builder'
26362631
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
@@ -2720,7 +2715,8 @@ jobs:
27202715
"rocq-9.1" --argstr job "mathcomp-analysis-stdlib"
27212716
mathcomp-bigenough:
27222717
needs:
2723-
- coq
2718+
- rocq-core
2719+
- mathcomp-boot
27242720
runs-on: ubuntu-latest
27252721
steps:
27262722
- name: Determine which commit to initially checkout
@@ -2770,9 +2766,13 @@ jobs:
27702766
\n sleep 30\n fi\nelse\n echo \"CI target already built\"\n echo \"\
27712767
status=fetched\" >> $GITHUB_OUTPUT\nfi\n"
27722768
- if: steps.stepCheck.outputs.status != 'fetched'
2773-
name: 'Building/fetching previous CI target: coq'
2769+
name: 'Building/fetching previous CI target: rocq-core'
27742770
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
2775-
"rocq-9.1" --argstr job "coq"
2771+
"rocq-9.1" --argstr job "rocq-core"
2772+
- if: steps.stepCheck.outputs.status != 'fetched'
2773+
name: 'Building/fetching previous CI target: mathcomp-boot'
2774+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
2775+
"rocq-9.1" --argstr job "mathcomp-boot"
27762776
- if: steps.stepCheck.outputs.status != 'fetched'
27772777
name: Building/fetching current CI target
27782778
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
@@ -2914,7 +2914,6 @@ jobs:
29142914
needs:
29152915
- coq
29162916
- mathcomp-ssreflect
2917-
- mathcomp-finmap
29182917
- hierarchy-builder
29192918
runs-on: ubuntu-latest
29202919
steps:
@@ -2972,10 +2971,6 @@ jobs:
29722971
name: 'Building/fetching previous CI target: mathcomp-ssreflect'
29732972
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
29742973
"rocq-9.1" --argstr job "mathcomp-ssreflect"
2975-
- if: steps.stepCheck.outputs.status != 'fetched'
2976-
name: 'Building/fetching previous CI target: mathcomp-finmap'
2977-
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
2978-
"rocq-9.1" --argstr job "mathcomp-finmap"
29792974
- if: steps.stepCheck.outputs.status != 'fetched'
29802975
name: 'Building/fetching previous CI target: hierarchy-builder'
29812976
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
@@ -3124,7 +3119,8 @@ jobs:
31243119
"rocq-9.1" --argstr job "mathcomp-fingroup"
31253120
mathcomp-finmap:
31263121
needs:
3127-
- coq
3122+
- rocq-core
3123+
- mathcomp-boot
31283124
runs-on: ubuntu-latest
31293125
steps:
31303126
- name: Determine which commit to initially checkout
@@ -3174,9 +3170,13 @@ jobs:
31743170
\n sleep 30\n fi\nelse\n echo \"CI target already built\"\n echo \"\
31753171
status=fetched\" >> $GITHUB_OUTPUT\nfi\n"
31763172
- if: steps.stepCheck.outputs.status != 'fetched'
3177-
name: 'Building/fetching previous CI target: coq'
3173+
name: 'Building/fetching previous CI target: rocq-core'
31783174
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
3179-
"rocq-9.1" --argstr job "coq"
3175+
"rocq-9.1" --argstr job "rocq-core"
3176+
- if: steps.stepCheck.outputs.status != 'fetched'
3177+
name: 'Building/fetching previous CI target: mathcomp-boot'
3178+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
3179+
"rocq-9.1" --argstr job "mathcomp-boot"
31803180
- if: steps.stepCheck.outputs.status != 'fetched'
31813181
name: Building/fetching current CI target
31823182
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
@@ -5010,7 +5010,7 @@ jobs:
50105010
"rocq-9.1" --argstr job "stdlib-refman-html"
50115011
stdpp:
50125012
needs:
5013-
- coq
5013+
- rocq-core
50145014
- stdlib
50155015
runs-on: ubuntu-latest
50165016
steps:
@@ -5061,9 +5061,9 @@ jobs:
50615061
\n sleep 30\n fi\nelse\n echo \"CI target already built\"\n echo \"\
50625062
status=fetched\" >> $GITHUB_OUTPUT\nfi\n"
50635063
- if: steps.stepCheck.outputs.status != 'fetched'
5064-
name: 'Building/fetching previous CI target: coq'
5064+
name: 'Building/fetching previous CI target: rocq-core'
50655065
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
5066-
"rocq-9.1" --argstr job "coq"
5066+
"rocq-9.1" --argstr job "rocq-core"
50675067
- if: steps.stepCheck.outputs.status != 'fetched'
50685068
name: 'Building/fetching previous CI target: stdlib'
50695069
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle

‎.github/workflows/nix-action-rocq-9.2.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4883,7 +4883,7 @@ jobs:
48834883
"rocq-9.2" --argstr job "stdlib-warnings"
48844884
stdpp:
48854885
needs:
4886-
- coq
4886+
- rocq-core
48874887
- stdlib
48884888
runs-on: ubuntu-latest
48894889
steps:
@@ -4934,9 +4934,9 @@ jobs:
49344934
\n sleep 30\n fi\nelse\n echo \"CI target already built\"\n echo \"\
49354935
status=fetched\" >> $GITHUB_OUTPUT\nfi\n"
49364936
- if: steps.stepCheck.outputs.status != 'fetched'
4937-
name: 'Building/fetching previous CI target: coq'
4937+
name: 'Building/fetching previous CI target: rocq-core'
49384938
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
4939-
"rocq-9.2" --argstr job "coq"
4939+
"rocq-9.2" --argstr job "rocq-core"
49404940
- if: steps.stepCheck.outputs.status != 'fetched'
49414941
name: 'Building/fetching previous CI target: stdlib'
49424942
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle

‎.nix/config.nix‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,18 +243,24 @@ with builtins; with (import <nixpkgs> {}).lib;
243243
{ name = p; value.override.version = "main"; }))
244244
// {
245245
coq-elpi.override.version = "master";
246-
coq-elpi.override.elpi-version = "3.4.2";
247246
tlc.override.version = "master-for-coq-ci";
248247
smtcoq-trakt.override.version = "with-trakt-coq-master";
249248
coq-tools.override.version = "proux01:coq_19955";
250249
stdlib-refman-html.job = true;
251250
iris-examples.job = false; # Currently broken
252251
jasmin.job = false; # Currently broken, c.f., https://github.com/rocq-prover/rocq/pull/20589
252+
ceres-bs.job = false; # not in Rocq CI
253+
ConCert.job = false; # not in Rocq CI
253254
ElmExtraction.job = false; # not in Rocq CI
254255
RustExtraction.job = false; # not in Rocq CI
255256
interval.job = false; # not in Rocq CI
256257
parseque.job = false; # not in Rocq CI
257258
LibHyps.job = false; # not in Rocq CI
259+
TypedExtraction.job = false; # not in Rocq CI
260+
TypedExtraction-common.job = false; # not in Rocq CI
261+
TypedExtraction-elm.job = false; # not in Rocq CI
262+
TypedExtraction-plugin.job = false; # not in Rocq CI
263+
TypedExtraction-rust.job = false; # not in Rocq CI
258264
# To add a simple overlay applying to all bundles,
259265
# add, just below this comment, a line like
260266
#<package>.override.version = "<github_login>:<branch>";
@@ -271,7 +277,6 @@ with builtins; with (import <nixpkgs> {}).lib;
271277
common-bundles = {
272278
bignums.override.version = "master";
273279
rocq-elpi.override.version = "master";
274-
rocq-elpi.override.elpi-version = "3.4.2";
275280
rocq-elpi-test.override.version = "master";
276281
hierarchy-builder.override.version = "master";
277282
};

‎.nix/coq-nix-toolbox.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
"60810ce1d3e73bece989ce9b9c42d9452c1d54a5"
1+
"307b3a341ab73125c1c9e65603b7d6b7447539e4"

0 commit comments

Comments
 (0)