Skip to content

Commit b591f49

Browse files
proux01proux01
authored
Merge pull request #129 from proux01/coq817rc1
Update nixpkgs for Coq 8.17+rc1
2 parents ee0b136 + e1575e5 commit b591f49

File tree

3 files changed

+217
-3
lines changed

3 files changed

+217
-3
lines changed

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

Lines changed: 214 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,214 @@
1+
jobs:
2+
bignums:
3+
needs:
4+
- coq
5+
runs-on: ubuntu-latest
6+
steps:
7+
- name: Determine which commit to test
8+
run: "if [ ${{ github.event_name }} = \"push\" ]; then\n echo \"tested_commit=${{\
9+
\ github.sha }}\" >> $GITHUB_ENV\nelse\n merge_commit=$(git ls-remote ${{\
10+
\ github.event.repository.html_url }} refs/pull/${{ github.event.number }}/merge\
11+
\ | cut -f1)\n if [ -z \"$merge_commit\" ]; then\n echo \"tested_commit=${{\
12+
\ github.event.pull_request.head.sha }}\" >> $GITHUB_ENV\n else\n echo\
13+
\ \"tested_commit=$merge_commit\" >> $GITHUB_ENV\n fi\nfi\n"
14+
- name: Git checkout
15+
uses: actions/checkout@v2
16+
with:
17+
fetch-depth: 0
18+
ref: ${{ env.tested_commit }}
19+
- name: Cachix install
20+
uses: cachix/install-nix-action@v16
21+
with:
22+
nix_path: nixpkgs=channel:nixpkgs-unstable
23+
- name: Cachix setup coq-community
24+
uses: cachix/cachix-action@v10
25+
with:
26+
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
27+
extraPullNames: coq, math-comp
28+
name: coq-community
29+
- id: stepCheck
30+
name: Checking presence of CI target bignums
31+
run: "nb_dry_run=$(NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link \\\n --argstr\
32+
\ bundle \"8.17\" --argstr job \"bignums\" \\\n --dry-run 2>&1 > /dev/null)\n\
33+
echo $nb_dry_run\necho ::set-output name=status::$(echo $nb_dry_run | grep\
34+
\ \"built:\" | sed \"s/.*/built/\")\n"
35+
- if: steps.stepCheck.outputs.status == 'built'
36+
name: 'Building/fetching previous CI target: coq'
37+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.17" --argstr
38+
job "coq"
39+
- if: steps.stepCheck.outputs.status == 'built'
40+
name: Building/fetching current CI target
41+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.17" --argstr
42+
job "bignums"
43+
coq:
44+
needs: []
45+
runs-on: ubuntu-latest
46+
steps:
47+
- name: Determine which commit to test
48+
run: "if [ ${{ github.event_name }} = \"push\" ]; then\n echo \"tested_commit=${{\
49+
\ github.sha }}\" >> $GITHUB_ENV\nelse\n merge_commit=$(git ls-remote ${{\
50+
\ github.event.repository.html_url }} refs/pull/${{ github.event.number }}/merge\
51+
\ | cut -f1)\n if [ -z \"$merge_commit\" ]; then\n echo \"tested_commit=${{\
52+
\ github.event.pull_request.head.sha }}\" >> $GITHUB_ENV\n else\n echo\
53+
\ \"tested_commit=$merge_commit\" >> $GITHUB_ENV\n fi\nfi\n"
54+
- name: Git checkout
55+
uses: actions/checkout@v2
56+
with:
57+
fetch-depth: 0
58+
ref: ${{ env.tested_commit }}
59+
- name: Cachix install
60+
uses: cachix/install-nix-action@v16
61+
with:
62+
nix_path: nixpkgs=channel:nixpkgs-unstable
63+
- name: Cachix setup coq-community
64+
uses: cachix/cachix-action@v10
65+
with:
66+
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
67+
extraPullNames: coq, math-comp
68+
name: coq-community
69+
- id: stepCheck
70+
name: Checking presence of CI target coq
71+
run: "nb_dry_run=$(NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link \\\n --argstr\
72+
\ bundle \"8.17\" --argstr job \"coq\" \\\n --dry-run 2>&1 > /dev/null)\n\
73+
echo $nb_dry_run\necho ::set-output name=status::$(echo $nb_dry_run | grep\
74+
\ \"built:\" | sed \"s/.*/built/\")\n"
75+
- if: steps.stepCheck.outputs.status == 'built'
76+
name: Building/fetching current CI target
77+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.17" --argstr
78+
job "coq"
79+
coq-shell:
80+
needs:
81+
- coq
82+
runs-on: ubuntu-latest
83+
steps:
84+
- name: Determine which commit to test
85+
run: "if [ ${{ github.event_name }} = \"push\" ]; then\n echo \"tested_commit=${{\
86+
\ github.sha }}\" >> $GITHUB_ENV\nelse\n merge_commit=$(git ls-remote ${{\
87+
\ github.event.repository.html_url }} refs/pull/${{ github.event.number }}/merge\
88+
\ | cut -f1)\n if [ -z \"$merge_commit\" ]; then\n echo \"tested_commit=${{\
89+
\ github.event.pull_request.head.sha }}\" >> $GITHUB_ENV\n else\n echo\
90+
\ \"tested_commit=$merge_commit\" >> $GITHUB_ENV\n fi\nfi\n"
91+
- name: Git checkout
92+
uses: actions/checkout@v2
93+
with:
94+
fetch-depth: 0
95+
ref: ${{ env.tested_commit }}
96+
- name: Cachix install
97+
uses: cachix/install-nix-action@v16
98+
with:
99+
nix_path: nixpkgs=channel:nixpkgs-unstable
100+
- name: Cachix setup coq-community
101+
uses: cachix/cachix-action@v10
102+
with:
103+
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
104+
extraPullNames: coq, math-comp
105+
name: coq-community
106+
- id: stepCheck
107+
name: Checking presence of CI target coq-shell
108+
run: "nb_dry_run=$(NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link \\\n --argstr\
109+
\ bundle \"8.17\" --argstr job \"coq-shell\" \\\n --dry-run 2>&1 > /dev/null)\n\
110+
echo $nb_dry_run\necho ::set-output name=status::$(echo $nb_dry_run | grep\
111+
\ \"built:\" | sed \"s/.*/built/\")\n"
112+
- if: steps.stepCheck.outputs.status == 'built'
113+
name: 'Building/fetching previous CI target: coq'
114+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.17" --argstr
115+
job "coq"
116+
- if: steps.stepCheck.outputs.status == 'built'
117+
name: Building/fetching current CI target
118+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.17" --argstr
119+
job "coq-shell"
120+
coqide:
121+
needs:
122+
- coq
123+
runs-on: ubuntu-latest
124+
steps:
125+
- name: Determine which commit to test
126+
run: "if [ ${{ github.event_name }} = \"push\" ]; then\n echo \"tested_commit=${{\
127+
\ github.sha }}\" >> $GITHUB_ENV\nelse\n merge_commit=$(git ls-remote ${{\
128+
\ github.event.repository.html_url }} refs/pull/${{ github.event.number }}/merge\
129+
\ | cut -f1)\n if [ -z \"$merge_commit\" ]; then\n echo \"tested_commit=${{\
130+
\ github.event.pull_request.head.sha }}\" >> $GITHUB_ENV\n else\n echo\
131+
\ \"tested_commit=$merge_commit\" >> $GITHUB_ENV\n fi\nfi\n"
132+
- name: Git checkout
133+
uses: actions/checkout@v2
134+
with:
135+
fetch-depth: 0
136+
ref: ${{ env.tested_commit }}
137+
- name: Cachix install
138+
uses: cachix/install-nix-action@v16
139+
with:
140+
nix_path: nixpkgs=channel:nixpkgs-unstable
141+
- name: Cachix setup coq-community
142+
uses: cachix/cachix-action@v10
143+
with:
144+
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
145+
extraPullNames: coq, math-comp
146+
name: coq-community
147+
- id: stepCheck
148+
name: Checking presence of CI target coqide
149+
run: "nb_dry_run=$(NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link \\\n --argstr\
150+
\ bundle \"8.17\" --argstr job \"coqide\" \\\n --dry-run 2>&1 > /dev/null)\n\
151+
echo $nb_dry_run\necho ::set-output name=status::$(echo $nb_dry_run | grep\
152+
\ \"built:\" | sed \"s/.*/built/\")\n"
153+
- if: steps.stepCheck.outputs.status == 'built'
154+
name: 'Building/fetching previous CI target: coq'
155+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.17" --argstr
156+
job "coq"
157+
- if: steps.stepCheck.outputs.status == 'built'
158+
name: Building/fetching current CI target
159+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.17" --argstr
160+
job "coqide"
161+
pocklington:
162+
needs:
163+
- coq
164+
runs-on: ubuntu-latest
165+
steps:
166+
- name: Determine which commit to test
167+
run: "if [ ${{ github.event_name }} = \"push\" ]; then\n echo \"tested_commit=${{\
168+
\ github.sha }}\" >> $GITHUB_ENV\nelse\n merge_commit=$(git ls-remote ${{\
169+
\ github.event.repository.html_url }} refs/pull/${{ github.event.number }}/merge\
170+
\ | cut -f1)\n if [ -z \"$merge_commit\" ]; then\n echo \"tested_commit=${{\
171+
\ github.event.pull_request.head.sha }}\" >> $GITHUB_ENV\n else\n echo\
172+
\ \"tested_commit=$merge_commit\" >> $GITHUB_ENV\n fi\nfi\n"
173+
- name: Git checkout
174+
uses: actions/checkout@v2
175+
with:
176+
fetch-depth: 0
177+
ref: ${{ env.tested_commit }}
178+
- name: Cachix install
179+
uses: cachix/install-nix-action@v16
180+
with:
181+
nix_path: nixpkgs=channel:nixpkgs-unstable
182+
- name: Cachix setup coq-community
183+
uses: cachix/cachix-action@v10
184+
with:
185+
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
186+
extraPullNames: coq, math-comp
187+
name: coq-community
188+
- id: stepCheck
189+
name: Checking presence of CI target pocklington
190+
run: "nb_dry_run=$(NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link \\\n --argstr\
191+
\ bundle \"8.17\" --argstr job \"pocklington\" \\\n --dry-run 2>&1 > /dev/null)\n\
192+
echo $nb_dry_run\necho ::set-output name=status::$(echo $nb_dry_run | grep\
193+
\ \"built:\" | sed \"s/.*/built/\")\n"
194+
- if: steps.stepCheck.outputs.status == 'built'
195+
name: 'Building/fetching previous CI target: coq'
196+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.17" --argstr
197+
job "coq"
198+
- if: steps.stepCheck.outputs.status == 'built'
199+
name: Building/fetching current CI target
200+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.17" --argstr
201+
job "pocklington"
202+
name: Nix CI for bundle 8.17
203+
'on':
204+
pull_request:
205+
paths:
206+
- .github/workflows/**
207+
pull_request_target:
208+
types:
209+
- opened
210+
- synchronize
211+
- reopened
212+
push:
213+
branches:
214+
- master

‎.nix/fallback-config.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ with (import (import ./nixpkgs.nix) {}).lib;
1818
## write one `bundles.name` attribute set per
1919
## alternative configuration, the can be used to
2020
## compute several ci jobs as well
21-
bundles = (genAttrs [ "8.10" "8.11" "8.12" "8.13" "8.14" "8.15" "8.16" ]
21+
bundles = (genAttrs [ "8.10" "8.11" "8.12" "8.13" "8.14" "8.15" "8.16" "8.17" ]
2222
(v: {
2323
coqPackages.coq.override.version = v;
2424
})) // {

‎.nix/nixpkgs.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
fetchTarball {
2-
url = https://github.com/NixOS/nixpkgs/archive/7e5e6625e2c9c35942e0f0a97fee18cd53991187.tar.gz;
3-
sha256 = "1sq77iprkyl0b6l1vylvvbk7mnvka9kgp229zz3vb53gn3967n1w";
2+
url = https://github.com/NixOS/nixpkgs/archive/4e9e5aeafeb41f780932097b6935087793b0ce06.tar.gz;
3+
sha256 = "05n22m4y96x1qxjcfi4aj12x6724cjdiy04631bvadphs8mrk15s";
44
}

0 commit comments

Comments
 (0)