Skip to content

Commit 9a33086

Browse files
CohenCyrilCohenCyril
authored
Merge pull request #316 from math-comp/update-opam-coq-elpi-1.16
Update nix & opam
2 parents e54d961 + 57c04ea commit 9a33086

File tree

6 files changed

+643
-62
lines changed

6 files changed

+643
-62
lines changed

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

Lines changed: 63 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ jobs:
141141
mathcomp-analysis:
142142
needs:
143143
- coq
144+
- mathcomp-classical
144145
- hierarchy-builder
145146
runs-on: ubuntu-latest
146147
steps:
@@ -176,18 +177,10 @@ jobs:
176177
name: 'Building/fetching previous CI target: coq'
177178
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.15"
178179
--argstr job "coq"
179-
- if: steps.stepCheck.outputs.status == 'built'
180-
name: 'Building/fetching previous CI target: mathcomp-ssreflect'
181-
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.15"
182-
--argstr job "mathcomp-ssreflect"
183180
- if: steps.stepCheck.outputs.status == 'built'
184181
name: 'Building/fetching previous CI target: mathcomp-field'
185182
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.15"
186183
--argstr job "mathcomp-field"
187-
- if: steps.stepCheck.outputs.status == 'built'
188-
name: 'Building/fetching previous CI target: mathcomp-finmap'
189-
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.15"
190-
--argstr job "mathcomp-finmap"
191184
- if: steps.stepCheck.outputs.status == 'built'
192185
name: 'Building/fetching previous CI target: mathcomp-bigenough'
193186
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.15"
@@ -196,6 +189,10 @@ jobs:
196189
name: 'Building/fetching previous CI target: mathcomp-real-closed'
197190
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.15"
198191
--argstr job "mathcomp-real-closed"
192+
- if: steps.stepCheck.outputs.status == 'built'
193+
name: 'Building/fetching previous CI target: mathcomp-classical'
194+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.15"
195+
--argstr job "mathcomp-classical"
199196
- if: steps.stepCheck.outputs.status == 'built'
200197
name: 'Building/fetching previous CI target: hierarchy-builder'
201198
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.15"
@@ -204,6 +201,64 @@ jobs:
204201
name: Building/fetching current CI target
205202
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.15"
206203
--argstr job "mathcomp-analysis"
204+
mathcomp-classical:
205+
needs:
206+
- coq
207+
- hierarchy-builder
208+
runs-on: ubuntu-latest
209+
steps:
210+
- name: Determine which commit to test
211+
run: "if [ ${{ github.event_name }} = \"push\" ]; then\n echo \"tested_commit=${{\
212+
\ github.sha }}\" >> $GITHUB_ENV\nelse\n merge_commit=$(git ls-remote ${{\
213+
\ github.event.repository.html_url }} refs/pull/${{ github.event.number }}/merge\
214+
\ | cut -f1)\n if [ -z \"$merge_commit\" ]; then\n echo \"tested_commit=${{\
215+
\ github.event.pull_request.head.sha }}\" >> $GITHUB_ENV\n else\n echo\
216+
\ \"tested_commit=$merge_commit\" >> $GITHUB_ENV\n fi\nfi\n"
217+
- name: Git checkout
218+
uses: actions/checkout@v2
219+
with:
220+
fetch-depth: 0
221+
ref: ${{ env.tested_commit }}
222+
- name: Cachix install
223+
uses: cachix/install-nix-action@v16
224+
with:
225+
nix_path: nixpkgs=channel:nixpkgs-unstable
226+
- name: Cachix setup math-comp
227+
uses: cachix/cachix-action@v10
228+
with:
229+
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
230+
extraPullNames: coq, coq-community
231+
name: math-comp
232+
- id: stepCheck
233+
name: Checking presence of CI target mathcomp-classical
234+
run: "nb_dry_run=$(NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link \\\n --argstr\
235+
\ bundle \"coq-8.15\" --argstr job \"mathcomp-classical\" \\\n --dry-run\
236+
\ 2>&1 > /dev/null)\necho $nb_dry_run\necho ::set-output name=status::$(echo\
237+
\ $nb_dry_run | grep \"built:\" | sed \"s/.*/built/\")\n"
238+
- if: steps.stepCheck.outputs.status == 'built'
239+
name: 'Building/fetching previous CI target: coq'
240+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.15"
241+
--argstr job "coq"
242+
- if: steps.stepCheck.outputs.status == 'built'
243+
name: 'Building/fetching previous CI target: mathcomp-ssreflect'
244+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.15"
245+
--argstr job "mathcomp-ssreflect"
246+
- if: steps.stepCheck.outputs.status == 'built'
247+
name: 'Building/fetching previous CI target: mathcomp-algebra'
248+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.15"
249+
--argstr job "mathcomp-algebra"
250+
- if: steps.stepCheck.outputs.status == 'built'
251+
name: 'Building/fetching previous CI target: mathcomp-finmap'
252+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.15"
253+
--argstr job "mathcomp-finmap"
254+
- if: steps.stepCheck.outputs.status == 'built'
255+
name: 'Building/fetching previous CI target: hierarchy-builder'
256+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.15"
257+
--argstr job "hierarchy-builder"
258+
- if: steps.stepCheck.outputs.status == 'built'
259+
name: Building/fetching current CI target
260+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.15"
261+
--argstr job "mathcomp-classical"
207262
mathcomp-single:
208263
needs:
209264
- coq

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

Lines changed: 37 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,10 @@ jobs:
3535
name: Building/fetching current CI target
3636
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.16"
3737
--argstr job "coq"
38-
coq-elpi:
38+
graph-theory:
3939
needs:
4040
- coq
41+
- hierarchy-builder
4142
runs-on: ubuntu-latest
4243
steps:
4344
- name: Determine which commit to test
@@ -63,23 +64,34 @@ jobs:
6364
extraPullNames: coq, coq-community
6465
name: math-comp
6566
- id: stepCheck
66-
name: Checking presence of CI target coq-elpi
67+
name: Checking presence of CI target graph-theory
6768
run: "nb_dry_run=$(NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link \\\n --argstr\
68-
\ bundle \"coq-8.16\" --argstr job \"coq-elpi\" \\\n --dry-run 2>&1 > /dev/null)\n\
69-
echo $nb_dry_run\necho ::set-output name=status::$(echo $nb_dry_run | grep\
70-
\ \"built:\" | sed \"s/.*/built/\")\n"
69+
\ bundle \"coq-8.16\" --argstr job \"graph-theory\" \\\n --dry-run 2>&1\
70+
\ > /dev/null)\necho $nb_dry_run\necho ::set-output name=status::$(echo $nb_dry_run\
71+
\ | grep \"built:\" | sed \"s/.*/built/\")\n"
7172
- if: steps.stepCheck.outputs.status == 'built'
7273
name: 'Building/fetching previous CI target: coq'
7374
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.16"
7475
--argstr job "coq"
76+
- if: steps.stepCheck.outputs.status == 'built'
77+
name: 'Building/fetching previous CI target: mathcomp-algebra'
78+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.16"
79+
--argstr job "mathcomp-algebra"
80+
- if: steps.stepCheck.outputs.status == 'built'
81+
name: 'Building/fetching previous CI target: mathcomp-fingroup'
82+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.16"
83+
--argstr job "mathcomp-fingroup"
84+
- if: steps.stepCheck.outputs.status == 'built'
85+
name: 'Building/fetching previous CI target: hierarchy-builder'
86+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.16"
87+
--argstr job "hierarchy-builder"
7588
- if: steps.stepCheck.outputs.status == 'built'
7689
name: Building/fetching current CI target
7790
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.16"
78-
--argstr job "coq-elpi"
91+
--argstr job "graph-theory"
7992
hierarchy-builder:
8093
needs:
8194
- coq
82-
- coq-elpi
8395
runs-on: ubuntu-latest
8496
steps:
8597
- name: Determine which commit to test
@@ -122,10 +134,9 @@ jobs:
122134
name: Building/fetching current CI target
123135
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.16"
124136
--argstr job "hierarchy-builder"
125-
mathcomp-analysis:
137+
mathcomp:
126138
needs:
127139
- coq
128-
- hierarchy-builder
129140
runs-on: ubuntu-latest
130141
steps:
131142
- name: Determine which commit to test
@@ -151,11 +162,11 @@ jobs:
151162
extraPullNames: coq, coq-community
152163
name: math-comp
153164
- id: stepCheck
154-
name: Checking presence of CI target mathcomp-analysis
165+
name: Checking presence of CI target mathcomp
155166
run: "nb_dry_run=$(NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link \\\n --argstr\
156-
\ bundle \"coq-8.16\" --argstr job \"mathcomp-analysis\" \\\n --dry-run\
157-
\ 2>&1 > /dev/null)\necho $nb_dry_run\necho ::set-output name=status::$(echo\
158-
\ $nb_dry_run | grep \"built:\" | sed \"s/.*/built/\")\n"
167+
\ bundle \"coq-8.16\" --argstr job \"mathcomp\" \\\n --dry-run 2>&1 > /dev/null)\n\
168+
echo $nb_dry_run\necho ::set-output name=status::$(echo $nb_dry_run | grep\
169+
\ \"built:\" | sed \"s/.*/built/\")\n"
159170
- if: steps.stepCheck.outputs.status == 'built'
160171
name: 'Building/fetching previous CI target: coq'
161172
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.16"
@@ -165,29 +176,32 @@ jobs:
165176
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.16"
166177
--argstr job "mathcomp-ssreflect"
167178
- if: steps.stepCheck.outputs.status == 'built'
168-
name: 'Building/fetching previous CI target: mathcomp-field'
179+
name: 'Building/fetching previous CI target: mathcomp-fingroup'
169180
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.16"
170-
--argstr job "mathcomp-field"
181+
--argstr job "mathcomp-fingroup"
171182
- if: steps.stepCheck.outputs.status == 'built'
172-
name: 'Building/fetching previous CI target: mathcomp-finmap'
183+
name: 'Building/fetching previous CI target: mathcomp-algebra'
173184
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.16"
174-
--argstr job "mathcomp-finmap"
185+
--argstr job "mathcomp-algebra"
175186
- if: steps.stepCheck.outputs.status == 'built'
176-
name: 'Building/fetching previous CI target: mathcomp-real-closed'
187+
name: 'Building/fetching previous CI target: mathcomp-solvable'
177188
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.16"
178-
--argstr job "mathcomp-real-closed"
189+
--argstr job "mathcomp-solvable"
179190
- if: steps.stepCheck.outputs.status == 'built'
180-
name: 'Building/fetching previous CI target: hierarchy-builder'
191+
name: 'Building/fetching previous CI target: mathcomp-field'
181192
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.16"
182-
--argstr job "hierarchy-builder"
193+
--argstr job "mathcomp-field"
194+
- if: steps.stepCheck.outputs.status == 'built'
195+
name: 'Building/fetching previous CI target: mathcomp-character'
196+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.16"
197+
--argstr job "mathcomp-character"
183198
- if: steps.stepCheck.outputs.status == 'built'
184199
name: Building/fetching current CI target
185200
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.16"
186-
--argstr job "mathcomp-analysis"
201+
--argstr job "mathcomp"
187202
mathcomp-single:
188203
needs:
189204
- coq
190-
- coq-elpi
191205
- hierarchy-builder
192206
runs-on: ubuntu-latest
193207
steps:
@@ -238,7 +252,6 @@ jobs:
238252
mathcomp-single-planB-src:
239253
needs:
240254
- coq
241-
- coq-elpi
242255
- hierarchy-builder
243256
runs-on: ubuntu-latest
244257
steps:

0 commit comments

Comments
 (0)