Skip to content

Commit f0ec947

Browse files
garesgares
authored
Merge pull request #872 from LPCIC/release
Release
2 parents 77262a5 + 1dccbb9 commit f0ec947

File tree

8 files changed

+128
-278
lines changed

8 files changed

+128
-278
lines changed

‎.github/workflows/nix-action-coq-8.20.yml‎

Lines changed: 13 additions & 259 deletions
Large diffs are not rendered by default.

‎.github/workflows/nix-action-coq-master.yml‎

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
jobs:
22
bignums:
33
needs:
4+
- rocq-core
45
- stdlib
56
runs-on: ubuntu-latest
67
steps:
@@ -50,6 +51,10 @@ jobs:
5051
) ; then\n echo \"waiting a bit for derivations that should be in cache\"\
5152
\n sleep 30\n fi\nelse\n echo \"CI target already built\"\n echo \"\
5253
status=fetched\" >> $GITHUB_OUTPUT\nfi\n"
54+
- if: steps.stepCheck.outputs.status != 'fetched'
55+
name: 'Building/fetching previous CI target: rocq-core'
56+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-master"
57+
--argstr job "rocq-core"
5358
- if: steps.stepCheck.outputs.status != 'fetched'
5459
name: 'Building/fetching previous CI target: stdlib'
5560
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-master"
@@ -59,7 +64,8 @@ jobs:
5964
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-master"
6065
--argstr job "bignums"
6166
coq:
62-
needs: []
67+
needs:
68+
- rocq-core
6369
runs-on: ubuntu-latest
6470
steps:
6571
- name: Determine which commit to initially checkout
@@ -108,12 +114,17 @@ jobs:
108114
) ; then\n echo \"waiting a bit for derivations that should be in cache\"\
109115
\n sleep 30\n fi\nelse\n echo \"CI target already built\"\n echo \"\
110116
status=fetched\" >> $GITHUB_OUTPUT\nfi\n"
117+
- if: steps.stepCheck.outputs.status != 'fetched'
118+
name: 'Building/fetching previous CI target: rocq-core'
119+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-master"
120+
--argstr job "rocq-core"
111121
- if: steps.stepCheck.outputs.status != 'fetched'
112122
name: Building/fetching current CI target
113123
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-master"
114124
--argstr job "coq"
115125
coq-elpi:
116-
needs: []
126+
needs:
127+
- rocq-core
117128
runs-on: ubuntu-latest
118129
steps:
119130
- name: Determine which commit to initially checkout
@@ -162,6 +173,10 @@ jobs:
162173
) ; then\n echo \"waiting a bit for derivations that should be in cache\"\
163174
\n sleep 30\n fi\nelse\n echo \"CI target already built\"\n echo \"\
164175
status=fetched\" >> $GITHUB_OUTPUT\nfi\n"
176+
- if: steps.stepCheck.outputs.status != 'fetched'
177+
name: 'Building/fetching previous CI target: rocq-core'
178+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-master"
179+
--argstr job "rocq-core"
165180
- if: steps.stepCheck.outputs.status != 'fetched'
166181
name: Building/fetching current CI target
167182
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-master"
@@ -301,6 +316,7 @@ jobs:
301316
--argstr job "coqeal"
302317
hierarchy-builder:
303318
needs:
319+
- rocq-core
304320
- coq-elpi
305321
runs-on: ubuntu-latest
306322
steps:
@@ -350,6 +366,10 @@ jobs:
350366
) ; then\n echo \"waiting a bit for derivations that should be in cache\"\
351367
\n sleep 30\n fi\nelse\n echo \"CI target already built\"\n echo \"\
352368
status=fetched\" >> $GITHUB_OUTPUT\nfi\n"
369+
- if: steps.stepCheck.outputs.status != 'fetched'
370+
name: 'Building/fetching previous CI target: rocq-core'
371+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-master"
372+
--argstr job "rocq-core"
353373
- if: steps.stepCheck.outputs.status != 'fetched'
354374
name: 'Building/fetching previous CI target: coq-elpi'
355375
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-master"
@@ -1942,7 +1962,8 @@ jobs:
19421962
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-master"
19431963
--argstr job "rocq-elpi"
19441964
rocq-elpi-tests:
1945-
needs: []
1965+
needs:
1966+
- rocq-core
19461967
runs-on: ubuntu-latest
19471968
steps:
19481969
- name: Determine which commit to initially checkout
@@ -1991,12 +2012,17 @@ jobs:
19912012
) ; then\n echo \"waiting a bit for derivations that should be in cache\"\
19922013
\n sleep 30\n fi\nelse\n echo \"CI target already built\"\n echo \"\
19932014
status=fetched\" >> $GITHUB_OUTPUT\nfi\n"
2015+
- if: steps.stepCheck.outputs.status != 'fetched'
2016+
name: 'Building/fetching previous CI target: rocq-core'
2017+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-master"
2018+
--argstr job "rocq-core"
19942019
- if: steps.stepCheck.outputs.status != 'fetched'
19952020
name: Building/fetching current CI target
19962021
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-master"
19972022
--argstr job "rocq-elpi-tests"
19982023
stdlib:
1999-
needs: []
2024+
needs:
2025+
- rocq-core
20002026
runs-on: ubuntu-latest
20012027
steps:
20022028
- name: Determine which commit to initially checkout
@@ -2045,6 +2071,10 @@ jobs:
20452071
) ; then\n echo \"waiting a bit for derivations that should be in cache\"\
20462072
\n sleep 30\n fi\nelse\n echo \"CI target already built\"\n echo \"\
20472073
status=fetched\" >> $GITHUB_OUTPUT\nfi\n"
2074+
- if: steps.stepCheck.outputs.status != 'fetched'
2075+
name: 'Building/fetching previous CI target: rocq-core'
2076+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-master"
2077+
--argstr job "rocq-core"
20482078
- if: steps.stepCheck.outputs.status != 'fetched'
20492079
name: Building/fetching current CI target
20502080
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-master"

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

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ jobs:
7070
--argstr job "autosubst"
7171
bignums:
7272
needs:
73+
- rocq-core
7374
- stdlib
7475
runs-on: ubuntu-latest
7576
steps:
@@ -119,6 +120,10 @@ jobs:
119120
) ; then\n echo \"waiting a bit for derivations that should be in cache\"\
120121
\n sleep 30\n fi\nelse\n echo \"CI target already built\"\n echo \"\
121122
status=fetched\" >> $GITHUB_OUTPUT\nfi\n"
123+
- if: steps.stepCheck.outputs.status != 'fetched'
124+
name: 'Building/fetching previous CI target: rocq-core'
125+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "rocq-9.0"
126+
--argstr job "rocq-core"
122127
- if: steps.stepCheck.outputs.status != 'fetched'
123128
name: 'Building/fetching previous CI target: stdlib'
124129
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "rocq-9.0"
@@ -128,7 +133,8 @@ jobs:
128133
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "rocq-9.0"
129134
--argstr job "bignums"
130135
coq:
131-
needs: []
136+
needs:
137+
- rocq-core
132138
runs-on: ubuntu-latest
133139
steps:
134140
- name: Determine which commit to initially checkout
@@ -177,12 +183,17 @@ jobs:
177183
) ; then\n echo \"waiting a bit for derivations that should be in cache\"\
178184
\n sleep 30\n fi\nelse\n echo \"CI target already built\"\n echo \"\
179185
status=fetched\" >> $GITHUB_OUTPUT\nfi\n"
186+
- if: steps.stepCheck.outputs.status != 'fetched'
187+
name: 'Building/fetching previous CI target: rocq-core'
188+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "rocq-9.0"
189+
--argstr job "rocq-core"
180190
- if: steps.stepCheck.outputs.status != 'fetched'
181191
name: Building/fetching current CI target
182192
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "rocq-9.0"
183193
--argstr job "coq"
184194
coq-elpi:
185-
needs: []
195+
needs:
196+
- rocq-core
186197
runs-on: ubuntu-latest
187198
steps:
188199
- name: Determine which commit to initially checkout
@@ -231,6 +242,10 @@ jobs:
231242
) ; then\n echo \"waiting a bit for derivations that should be in cache\"\
232243
\n sleep 30\n fi\nelse\n echo \"CI target already built\"\n echo \"\
233244
status=fetched\" >> $GITHUB_OUTPUT\nfi\n"
245+
- if: steps.stepCheck.outputs.status != 'fetched'
246+
name: 'Building/fetching previous CI target: rocq-core'
247+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "rocq-9.0"
248+
--argstr job "rocq-core"
234249
- if: steps.stepCheck.outputs.status != 'fetched'
235250
name: Building/fetching current CI target
236251
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "rocq-9.0"
@@ -370,6 +385,7 @@ jobs:
370385
--argstr job "coqeal"
371386
hierarchy-builder:
372387
needs:
388+
- rocq-core
373389
- coq-elpi
374390
runs-on: ubuntu-latest
375391
steps:
@@ -419,6 +435,10 @@ jobs:
419435
) ; then\n echo \"waiting a bit for derivations that should be in cache\"\
420436
\n sleep 30\n fi\nelse\n echo \"CI target already built\"\n echo \"\
421437
status=fetched\" >> $GITHUB_OUTPUT\nfi\n"
438+
- if: steps.stepCheck.outputs.status != 'fetched'
439+
name: 'Building/fetching previous CI target: rocq-core'
440+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "rocq-9.0"
441+
--argstr job "rocq-core"
422442
- if: steps.stepCheck.outputs.status != 'fetched'
423443
name: 'Building/fetching previous CI target: coq-elpi'
424444
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "rocq-9.0"
@@ -2011,7 +2031,8 @@ jobs:
20112031
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "rocq-9.0"
20122032
--argstr job "rocq-elpi"
20132033
rocq-elpi-tests:
2014-
needs: []
2034+
needs:
2035+
- rocq-core
20152036
runs-on: ubuntu-latest
20162037
steps:
20172038
- name: Determine which commit to initially checkout
@@ -2060,12 +2081,17 @@ jobs:
20602081
) ; then\n echo \"waiting a bit for derivations that should be in cache\"\
20612082
\n sleep 30\n fi\nelse\n echo \"CI target already built\"\n echo \"\
20622083
status=fetched\" >> $GITHUB_OUTPUT\nfi\n"
2084+
- if: steps.stepCheck.outputs.status != 'fetched'
2085+
name: 'Building/fetching previous CI target: rocq-core'
2086+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "rocq-9.0"
2087+
--argstr job "rocq-core"
20632088
- if: steps.stepCheck.outputs.status != 'fetched'
20642089
name: Building/fetching current CI target
20652090
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "rocq-9.0"
20662091
--argstr job "rocq-elpi-tests"
20672092
stdlib:
2068-
needs: []
2093+
needs:
2094+
- rocq-core
20692095
runs-on: ubuntu-latest
20702096
steps:
20712097
- name: Determine which commit to initially checkout
@@ -2114,6 +2140,10 @@ jobs:
21142140
) ; then\n echo \"waiting a bit for derivations that should be in cache\"\
21152141
\n sleep 30\n fi\nelse\n echo \"CI target already built\"\n echo \"\
21162142
status=fetched\" >> $GITHUB_OUTPUT\nfi\n"
2143+
- if: steps.stepCheck.outputs.status != 'fetched'
2144+
name: 'Building/fetching previous CI target: rocq-core'
2145+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "rocq-9.0"
2146+
--argstr job "rocq-core"
21172147
- if: steps.stepCheck.outputs.status != 'fetched'
21182148
name: Building/fetching current CI target
21192149
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "rocq-9.0"

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

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ jobs:
7070
--argstr job "autosubst"
7171
bignums:
7272
needs:
73+
- rocq-core
7374
- stdlib
7475
runs-on: ubuntu-latest
7576
steps:
@@ -119,6 +120,10 @@ jobs:
119120
) ; then\n echo \"waiting a bit for derivations that should be in cache\"\
120121
\n sleep 30\n fi\nelse\n echo \"CI target already built\"\n echo \"\
121122
status=fetched\" >> $GITHUB_OUTPUT\nfi\n"
123+
- if: steps.stepCheck.outputs.status != 'fetched'
124+
name: 'Building/fetching previous CI target: rocq-core'
125+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "rocq-9.1"
126+
--argstr job "rocq-core"
122127
- if: steps.stepCheck.outputs.status != 'fetched'
123128
name: 'Building/fetching previous CI target: stdlib'
124129
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "rocq-9.1"
@@ -128,7 +133,8 @@ jobs:
128133
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "rocq-9.1"
129134
--argstr job "bignums"
130135
coq:
131-
needs: []
136+
needs:
137+
- rocq-core
132138
runs-on: ubuntu-latest
133139
steps:
134140
- name: Determine which commit to initially checkout
@@ -177,12 +183,17 @@ jobs:
177183
) ; then\n echo \"waiting a bit for derivations that should be in cache\"\
178184
\n sleep 30\n fi\nelse\n echo \"CI target already built\"\n echo \"\
179185
status=fetched\" >> $GITHUB_OUTPUT\nfi\n"
186+
- if: steps.stepCheck.outputs.status != 'fetched'
187+
name: 'Building/fetching previous CI target: rocq-core'
188+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "rocq-9.1"
189+
--argstr job "rocq-core"
180190
- if: steps.stepCheck.outputs.status != 'fetched'
181191
name: Building/fetching current CI target
182192
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "rocq-9.1"
183193
--argstr job "coq"
184194
coq-elpi:
185-
needs: []
195+
needs:
196+
- rocq-core
186197
runs-on: ubuntu-latest
187198
steps:
188199
- name: Determine which commit to initially checkout
@@ -231,6 +242,10 @@ jobs:
231242
) ; then\n echo \"waiting a bit for derivations that should be in cache\"\
232243
\n sleep 30\n fi\nelse\n echo \"CI target already built\"\n echo \"\
233244
status=fetched\" >> $GITHUB_OUTPUT\nfi\n"
245+
- if: steps.stepCheck.outputs.status != 'fetched'
246+
name: 'Building/fetching previous CI target: rocq-core'
247+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "rocq-9.1"
248+
--argstr job "rocq-core"
234249
- if: steps.stepCheck.outputs.status != 'fetched'
235250
name: Building/fetching current CI target
236251
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "rocq-9.1"
@@ -370,6 +385,7 @@ jobs:
370385
--argstr job "coqeal"
371386
hierarchy-builder:
372387
needs:
388+
- rocq-core
373389
- coq-elpi
374390
runs-on: ubuntu-latest
375391
steps:
@@ -419,6 +435,10 @@ jobs:
419435
) ; then\n echo \"waiting a bit for derivations that should be in cache\"\
420436
\n sleep 30\n fi\nelse\n echo \"CI target already built\"\n echo \"\
421437
status=fetched\" >> $GITHUB_OUTPUT\nfi\n"
438+
- if: steps.stepCheck.outputs.status != 'fetched'
439+
name: 'Building/fetching previous CI target: rocq-core'
440+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "rocq-9.1"
441+
--argstr job "rocq-core"
422442
- if: steps.stepCheck.outputs.status != 'fetched'
423443
name: 'Building/fetching previous CI target: coq-elpi'
424444
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "rocq-9.1"
@@ -2011,7 +2031,8 @@ jobs:
20112031
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "rocq-9.1"
20122032
--argstr job "rocq-elpi"
20132033
rocq-elpi-tests:
2014-
needs: []
2034+
needs:
2035+
- rocq-core
20152036
runs-on: ubuntu-latest
20162037
steps:
20172038
- name: Determine which commit to initially checkout
@@ -2060,12 +2081,17 @@ jobs:
20602081
) ; then\n echo \"waiting a bit for derivations that should be in cache\"\
20612082
\n sleep 30\n fi\nelse\n echo \"CI target already built\"\n echo \"\
20622083
status=fetched\" >> $GITHUB_OUTPUT\nfi\n"
2084+
- if: steps.stepCheck.outputs.status != 'fetched'
2085+
name: 'Building/fetching previous CI target: rocq-core'
2086+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "rocq-9.1"
2087+
--argstr job "rocq-core"
20632088
- if: steps.stepCheck.outputs.status != 'fetched'
20642089
name: Building/fetching current CI target
20652090
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "rocq-9.1"
20662091
--argstr job "rocq-elpi-tests"
20672092
stdlib:
2068-
needs: []
2093+
needs:
2094+
- rocq-core
20692095
runs-on: ubuntu-latest
20702096
steps:
20712097
- name: Determine which commit to initially checkout
@@ -2114,6 +2140,10 @@ jobs:
21142140
) ; then\n echo \"waiting a bit for derivations that should be in cache\"\
21152141
\n sleep 30\n fi\nelse\n echo \"CI target already built\"\n echo \"\
21162142
status=fetched\" >> $GITHUB_OUTPUT\nfi\n"
2143+
- if: steps.stepCheck.outputs.status != 'fetched'
2144+
name: 'Building/fetching previous CI target: rocq-core'
2145+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "rocq-9.1"
2146+
--argstr job "rocq-core"
21172147
- if: steps.stepCheck.outputs.status != 'fetched'
21182148
name: Building/fetching current CI target
21192149
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "rocq-9.1"

‎.nix/config.nix‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ let master = [
1212
"trakt"
1313
];
1414
rocq-common-bundles = {
15-
rocq-elpi.override.elpi-version = "v3.0.1";
15+
rocq-elpi.override.elpi-version = "v3.1.0";
1616
hierarchy-builder.override.version = "master";
1717
rocq-elpi-tests.job = true;
1818
};
1919
coq-common-bundles = listToAttrs (forEach master (p:
2020
{ name = p; value.override.version = "master"; }))
2121
// {
22-
coq-elpi.override.elpi-version = "v3.0.1";
22+
coq-elpi.override.elpi-version = "v3.1.0";
2323
coq-elpi-tests-stdlib.job = true;
2424

2525
mathcomp-boot.job = true;
@@ -60,7 +60,7 @@ let master = [
6060

6161
"coq-8.20".coqPackages = coq-common-bundles // {
6262
coq.override.version = "8.20";
63-
coq-elpi.override.elpi-version = "v3.0.1";
63+
coq-elpi.override.elpi-version = "v3.1.0";
6464
};
6565

6666
"rocq-9.0" = { rocqPackages = rocq-common-bundles // {
@@ -91,12 +91,12 @@ let master = [
9191
/* uncomment bundle below if min and max elpi version start to differ
9292
"coq-master-min-elpi" = { rocqPackages = rocq-common-bundles // {
9393
rocq-core.override.version = "master";
94-
rocq-elpi.override.elpi-version = "v3.0.1";
94+
rocq-elpi.override.elpi-version = "v3.1.0";
9595
stdlib.override.version = "master";
9696
bignums.override.version = "master";
9797
}; coqPackages = coq-common-bundles // {
9898
coq.override.version = "master";
99-
coq-elpi.override.elpi-version = "v3.0.1";
99+
coq-elpi.override.elpi-version = "v3.1.0";
100100
stdlib.override.version = "master";
101101
bignums.override.version = "master";
102102
}; }; */

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
"e4f4560d9d6fcc41a5050dfbfca1d46b5f6c0583"
1+
"ef49c0f062e0fb852da63b48a7b08374fdb308e7"

0 commit comments

Comments
 (0)