Skip to content

Commit 88a03a0

Browse files
Zimmi48Zimmi48
authored
Merge pull request #86 from coq-community/coq-8.15
Update nixpkgs after Coq 8.15 addition.
2 parents d708599 + 6bfd968 commit 88a03a0

File tree

7 files changed

+1284
-56
lines changed

7 files changed

+1284
-56
lines changed

‎.github/workflows/nix-action-8.12.yml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,6 @@ jobs:
284284
needs:
285285
- coq
286286
- ITree
287-
- compcert
288287
runs-on: ubuntu-latest
289288
steps:
290289
- name: Determine which commit to test
@@ -323,10 +322,6 @@ jobs:
323322
name: 'Building/fetching previous CI target: ITree'
324323
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.12" --argstr
325324
job "ITree"
326-
- if: steps.stepCheck.outputs.status == 'built'
327-
name: 'Building/fetching previous CI target: compcert'
328-
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.12" --argstr
329-
job "compcert"
330325
- if: steps.stepCheck.outputs.status == 'built'
331326
name: Building/fetching current CI target
332327
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.12" --argstr

‎.github/workflows/nix-action-8.13.yml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,6 @@ jobs:
284284
needs:
285285
- coq
286286
- ITree
287-
- compcert
288287
runs-on: ubuntu-latest
289288
steps:
290289
- name: Determine which commit to test
@@ -323,10 +322,6 @@ jobs:
323322
name: 'Building/fetching previous CI target: ITree'
324323
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.13" --argstr
325324
job "ITree"
326-
- if: steps.stepCheck.outputs.status == 'built'
327-
name: 'Building/fetching previous CI target: compcert'
328-
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.13" --argstr
329-
job "compcert"
330325
- if: steps.stepCheck.outputs.status == 'built'
331326
name: Building/fetching current CI target
332327
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.13" --argstr

‎.github/workflows/nix-action-8.14.yml‎

Lines changed: 133 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -408,6 +408,52 @@ jobs:
408408
name: Building/fetching current CI target
409409
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.14" --argstr
410410
job "ceres"
411+
compcert:
412+
needs:
413+
- coq
414+
- flocq
415+
runs-on: ubuntu-latest
416+
steps:
417+
- name: Determine which commit to test
418+
run: "if [ ${{ github.event_name }} = \"push\" ]; then\n echo \"tested_commit=${{\
419+
\ github.sha }}\" >> $GITHUB_ENV\nelse\n merge_commit=$(git ls-remote ${{\
420+
\ github.event.repository.html_url }} refs/pull/${{ github.event.number }}/merge\
421+
\ | cut -f1)\n if [ -z \"$merge_commit\" ]; then\n echo \"tested_commit=${{\
422+
\ github.event.pull_request.head.sha }}\" >> $GITHUB_ENV\n else\n echo\
423+
\ \"tested_commit=$merge_commit\" >> $GITHUB_ENV\n fi\nfi\n"
424+
- name: Git checkout
425+
uses: actions/checkout@v2
426+
with:
427+
fetch-depth: 0
428+
ref: ${{ env.tested_commit }}
429+
- name: Cachix install
430+
uses: cachix/install-nix-action@v16
431+
with:
432+
nix_path: nixpkgs=channel:nixpkgs-unstable
433+
- name: Cachix setup coq-community
434+
uses: cachix/cachix-action@v10
435+
with:
436+
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
437+
extraPullNames: coq, math-comp
438+
name: coq-community
439+
- id: stepCheck
440+
name: Checking presence of CI target compcert
441+
run: "nb_dry_run=$(NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link \\\n --argstr\
442+
\ bundle \"8.14\" --argstr job \"compcert\" \\\n --dry-run 2>&1 > /dev/null)\n\
443+
echo $nb_dry_run\necho ::set-output name=status::$(echo $nb_dry_run | grep\
444+
\ \"built:\" | sed \"s/.*/built/\")\n"
445+
- if: steps.stepCheck.outputs.status == 'built'
446+
name: 'Building/fetching previous CI target: coq'
447+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.14" --argstr
448+
job "coq"
449+
- if: steps.stepCheck.outputs.status == 'built'
450+
name: 'Building/fetching previous CI target: flocq'
451+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.14" --argstr
452+
job "flocq"
453+
- if: steps.stepCheck.outputs.status == 'built'
454+
name: Building/fetching current CI target
455+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.14" --argstr
456+
job "compcert"
411457
coq:
412458
needs: []
413459
runs-on: ubuntu-latest
@@ -720,6 +766,93 @@ jobs:
720766
name: Building/fetching current CI target
721767
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.14" --argstr
722768
job "coqeal"
769+
coqhammer:
770+
needs:
771+
- coq
772+
runs-on: ubuntu-latest
773+
steps:
774+
- name: Determine which commit to test
775+
run: "if [ ${{ github.event_name }} = \"push\" ]; then\n echo \"tested_commit=${{\
776+
\ github.sha }}\" >> $GITHUB_ENV\nelse\n merge_commit=$(git ls-remote ${{\
777+
\ github.event.repository.html_url }} refs/pull/${{ github.event.number }}/merge\
778+
\ | cut -f1)\n if [ -z \"$merge_commit\" ]; then\n echo \"tested_commit=${{\
779+
\ github.event.pull_request.head.sha }}\" >> $GITHUB_ENV\n else\n echo\
780+
\ \"tested_commit=$merge_commit\" >> $GITHUB_ENV\n fi\nfi\n"
781+
- name: Git checkout
782+
uses: actions/checkout@v2
783+
with:
784+
fetch-depth: 0
785+
ref: ${{ env.tested_commit }}
786+
- name: Cachix install
787+
uses: cachix/install-nix-action@v16
788+
with:
789+
nix_path: nixpkgs=channel:nixpkgs-unstable
790+
- name: Cachix setup coq-community
791+
uses: cachix/cachix-action@v10
792+
with:
793+
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
794+
extraPullNames: coq, math-comp
795+
name: coq-community
796+
- id: stepCheck
797+
name: Checking presence of CI target coqhammer
798+
run: "nb_dry_run=$(NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link \\\n --argstr\
799+
\ bundle \"8.14\" --argstr job \"coqhammer\" \\\n --dry-run 2>&1 > /dev/null)\n\
800+
echo $nb_dry_run\necho ::set-output name=status::$(echo $nb_dry_run | grep\
801+
\ \"built:\" | sed \"s/.*/built/\")\n"
802+
- if: steps.stepCheck.outputs.status == 'built'
803+
name: 'Building/fetching previous CI target: coq'
804+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.14" --argstr
805+
job "coq"
806+
- if: steps.stepCheck.outputs.status == 'built'
807+
name: Building/fetching current CI target
808+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.14" --argstr
809+
job "coqhammer"
810+
coqprime:
811+
needs:
812+
- coq
813+
- bignums
814+
runs-on: ubuntu-latest
815+
steps:
816+
- name: Determine which commit to test
817+
run: "if [ ${{ github.event_name }} = \"push\" ]; then\n echo \"tested_commit=${{\
818+
\ github.sha }}\" >> $GITHUB_ENV\nelse\n merge_commit=$(git ls-remote ${{\
819+
\ github.event.repository.html_url }} refs/pull/${{ github.event.number }}/merge\
820+
\ | cut -f1)\n if [ -z \"$merge_commit\" ]; then\n echo \"tested_commit=${{\
821+
\ github.event.pull_request.head.sha }}\" >> $GITHUB_ENV\n else\n echo\
822+
\ \"tested_commit=$merge_commit\" >> $GITHUB_ENV\n fi\nfi\n"
823+
- name: Git checkout
824+
uses: actions/checkout@v2
825+
with:
826+
fetch-depth: 0
827+
ref: ${{ env.tested_commit }}
828+
- name: Cachix install
829+
uses: cachix/install-nix-action@v16
830+
with:
831+
nix_path: nixpkgs=channel:nixpkgs-unstable
832+
- name: Cachix setup coq-community
833+
uses: cachix/cachix-action@v10
834+
with:
835+
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
836+
extraPullNames: coq, math-comp
837+
name: coq-community
838+
- id: stepCheck
839+
name: Checking presence of CI target coqprime
840+
run: "nb_dry_run=$(NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link \\\n --argstr\
841+
\ bundle \"8.14\" --argstr job \"coqprime\" \\\n --dry-run 2>&1 > /dev/null)\n\
842+
echo $nb_dry_run\necho ::set-output name=status::$(echo $nb_dry_run | grep\
843+
\ \"built:\" | sed \"s/.*/built/\")\n"
844+
- if: steps.stepCheck.outputs.status == 'built'
845+
name: 'Building/fetching previous CI target: coq'
846+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.14" --argstr
847+
job "coq"
848+
- if: steps.stepCheck.outputs.status == 'built'
849+
name: 'Building/fetching previous CI target: bignums'
850+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.14" --argstr
851+
job "bignums"
852+
- if: steps.stepCheck.outputs.status == 'built'
853+
name: Building/fetching current CI target
854+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.14" --argstr
855+
job "coqprime"
723856
coquelicot:
724857
needs:
725858
- coq
@@ -2337,47 +2470,6 @@ jobs:
23372470
name: Building/fetching current CI target
23382471
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.14" --argstr
23392472
job "reglang"
2340-
serapi:
2341-
needs:
2342-
- coq
2343-
runs-on: ubuntu-latest
2344-
steps:
2345-
- name: Determine which commit to test
2346-
run: "if [ ${{ github.event_name }} = \"push\" ]; then\n echo \"tested_commit=${{\
2347-
\ github.sha }}\" >> $GITHUB_ENV\nelse\n merge_commit=$(git ls-remote ${{\
2348-
\ github.event.repository.html_url }} refs/pull/${{ github.event.number }}/merge\
2349-
\ | cut -f1)\n if [ -z \"$merge_commit\" ]; then\n echo \"tested_commit=${{\
2350-
\ github.event.pull_request.head.sha }}\" >> $GITHUB_ENV\n else\n echo\
2351-
\ \"tested_commit=$merge_commit\" >> $GITHUB_ENV\n fi\nfi\n"
2352-
- name: Git checkout
2353-
uses: actions/checkout@v2
2354-
with:
2355-
fetch-depth: 0
2356-
ref: ${{ env.tested_commit }}
2357-
- name: Cachix install
2358-
uses: cachix/install-nix-action@v16
2359-
with:
2360-
nix_path: nixpkgs=channel:nixpkgs-unstable
2361-
- name: Cachix setup coq-community
2362-
uses: cachix/cachix-action@v10
2363-
with:
2364-
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
2365-
extraPullNames: coq, math-comp
2366-
name: coq-community
2367-
- id: stepCheck
2368-
name: Checking presence of CI target serapi
2369-
run: "nb_dry_run=$(NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link \\\n --argstr\
2370-
\ bundle \"8.14\" --argstr job \"serapi\" \\\n --dry-run 2>&1 > /dev/null)\n\
2371-
echo $nb_dry_run\necho ::set-output name=status::$(echo $nb_dry_run | grep\
2372-
\ \"built:\" | sed \"s/.*/built/\")\n"
2373-
- if: steps.stepCheck.outputs.status == 'built'
2374-
name: 'Building/fetching previous CI target: coq'
2375-
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.14" --argstr
2376-
job "coq"
2377-
- if: steps.stepCheck.outputs.status == 'built'
2378-
name: Building/fetching current CI target
2379-
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.14" --argstr
2380-
job "serapi"
23812473
stdpp:
23822474
needs:
23832475
- coq

0 commit comments

Comments
 (0)