Skip to content

Commit 2c1342a

Browse files
garesgares
authored
Merge pull request #642 from LPCIC/fix-nix
remove reglang and deriving jobs
2 parents d4f362b + 93ebf13 commit 2c1342a

File tree

3 files changed

+6
-224
lines changed

3 files changed

+6
-224
lines changed

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

Lines changed: 0 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -170,62 +170,6 @@ jobs:
170170
name: Building/fetching current CI target
171171
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.19"
172172
--argstr job "coquelicot"
173-
deriving:
174-
needs:
175-
- mathcomp-ssreflect
176-
runs-on: ubuntu-latest
177-
steps:
178-
- name: Determine which commit to initially checkout
179-
run: "if [ ${{ github.event_name }} = \"push\" ]; then\n echo \"target_commit=${{\
180-
\ github.sha }}\" >> $GITHUB_ENV\nelse\n echo \"target_commit=${{ github.event.pull_request.head.sha\
181-
\ }}\" >> $GITHUB_ENV\nfi\n"
182-
- name: Git checkout
183-
uses: actions/checkout@v3
184-
with:
185-
fetch-depth: 0
186-
ref: ${{ env.target_commit }}
187-
- name: Determine which commit to test
188-
run: "if [ ${{ github.event_name }} = \"push\" ]; then\n echo \"tested_commit=${{\
189-
\ github.sha }}\" >> $GITHUB_ENV\nelse\n merge_commit=$(git ls-remote ${{\
190-
\ github.event.repository.html_url }} refs/pull/${{ github.event.number }}/merge\
191-
\ | cut -f1)\n mergeable=$(git merge --no-commit --no-ff ${{ github.event.pull_request.base.sha\
192-
\ }} > /dev/null 2>&1; echo $?; git merge --abort > /dev/null 2>&1 || true)\n\
193-
\ if [ -z \"$merge_commit\" -o \"x$mergeable\" != \"x0\" ]; then\n echo\
194-
\ \"tested_commit=${{ github.event.pull_request.head.sha }}\" >> $GITHUB_ENV\n\
195-
\ else\n echo \"tested_commit=$merge_commit\" >> $GITHUB_ENV\n fi\nfi\n"
196-
- name: Git checkout
197-
uses: actions/checkout@v3
198-
with:
199-
fetch-depth: 0
200-
ref: ${{ env.tested_commit }}
201-
- name: Cachix install
202-
uses: cachix/install-nix-action@v27
203-
with:
204-
nix_path: nixpkgs=channel:nixpkgs-unstable
205-
- name: Cachix setup coq-elpi
206-
uses: cachix/cachix-action@v15
207-
with:
208-
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
209-
extraPullNames: coq, coq-community, math-comp
210-
name: coq-elpi
211-
- id: stepCheck
212-
name: Checking presence of CI target deriving
213-
run: "nb_dry_run=$(NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link \\\n --argstr\
214-
\ bundle \"coq-8.19\" --argstr job \"deriving\" \\\n --dry-run 2>&1 > /dev/null)\n\
215-
echo $nb_dry_run\necho status=$(echo $nb_dry_run | grep \"built:\" | sed \"\
216-
s/.*/built/\") >> $GITHUB_OUTPUT\n"
217-
- if: steps.stepCheck.outputs.status == 'built'
218-
name: 'Building/fetching previous CI target: coq'
219-
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.19"
220-
--argstr job "coq"
221-
- if: steps.stepCheck.outputs.status == 'built'
222-
name: 'Building/fetching previous CI target: mathcomp-ssreflect'
223-
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.19"
224-
--argstr job "mathcomp-ssreflect"
225-
- if: steps.stepCheck.outputs.status == 'built'
226-
name: Building/fetching current CI target
227-
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.19"
228-
--argstr job "deriving"
229173
hierarchy-builder:
230174
needs:
231175
- coq-elpi
@@ -1188,62 +1132,6 @@ jobs:
11881132
name: Building/fetching current CI target
11891133
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.19"
11901134
--argstr job "odd-order"
1191-
reglang:
1192-
needs:
1193-
- mathcomp-ssreflect
1194-
runs-on: ubuntu-latest
1195-
steps:
1196-
- name: Determine which commit to initially checkout
1197-
run: "if [ ${{ github.event_name }} = \"push\" ]; then\n echo \"target_commit=${{\
1198-
\ github.sha }}\" >> $GITHUB_ENV\nelse\n echo \"target_commit=${{ github.event.pull_request.head.sha\
1199-
\ }}\" >> $GITHUB_ENV\nfi\n"
1200-
- name: Git checkout
1201-
uses: actions/checkout@v3
1202-
with:
1203-
fetch-depth: 0
1204-
ref: ${{ env.target_commit }}
1205-
- name: Determine which commit to test
1206-
run: "if [ ${{ github.event_name }} = \"push\" ]; then\n echo \"tested_commit=${{\
1207-
\ github.sha }}\" >> $GITHUB_ENV\nelse\n merge_commit=$(git ls-remote ${{\
1208-
\ github.event.repository.html_url }} refs/pull/${{ github.event.number }}/merge\
1209-
\ | cut -f1)\n mergeable=$(git merge --no-commit --no-ff ${{ github.event.pull_request.base.sha\
1210-
\ }} > /dev/null 2>&1; echo $?; git merge --abort > /dev/null 2>&1 || true)\n\
1211-
\ if [ -z \"$merge_commit\" -o \"x$mergeable\" != \"x0\" ]; then\n echo\
1212-
\ \"tested_commit=${{ github.event.pull_request.head.sha }}\" >> $GITHUB_ENV\n\
1213-
\ else\n echo \"tested_commit=$merge_commit\" >> $GITHUB_ENV\n fi\nfi\n"
1214-
- name: Git checkout
1215-
uses: actions/checkout@v3
1216-
with:
1217-
fetch-depth: 0
1218-
ref: ${{ env.tested_commit }}
1219-
- name: Cachix install
1220-
uses: cachix/install-nix-action@v27
1221-
with:
1222-
nix_path: nixpkgs=channel:nixpkgs-unstable
1223-
- name: Cachix setup coq-elpi
1224-
uses: cachix/cachix-action@v15
1225-
with:
1226-
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
1227-
extraPullNames: coq, coq-community, math-comp
1228-
name: coq-elpi
1229-
- id: stepCheck
1230-
name: Checking presence of CI target reglang
1231-
run: "nb_dry_run=$(NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link \\\n --argstr\
1232-
\ bundle \"coq-8.19\" --argstr job \"reglang\" \\\n --dry-run 2>&1 > /dev/null)\n\
1233-
echo $nb_dry_run\necho status=$(echo $nb_dry_run | grep \"built:\" | sed \"\
1234-
s/.*/built/\") >> $GITHUB_OUTPUT\n"
1235-
- if: steps.stepCheck.outputs.status == 'built'
1236-
name: 'Building/fetching previous CI target: coq'
1237-
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.19"
1238-
--argstr job "coq"
1239-
- if: steps.stepCheck.outputs.status == 'built'
1240-
name: 'Building/fetching previous CI target: mathcomp-ssreflect'
1241-
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.19"
1242-
--argstr job "mathcomp-ssreflect"
1243-
- if: steps.stepCheck.outputs.status == 'built'
1244-
name: Building/fetching current CI target
1245-
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.19"
1246-
--argstr job "reglang"
12471135
vcfloat:
12481136
needs:
12491137
- interval

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

Lines changed: 0 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -170,62 +170,6 @@ jobs:
170170
name: Building/fetching current CI target
171171
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-master"
172172
--argstr job "coquelicot"
173-
deriving:
174-
needs:
175-
- mathcomp-ssreflect
176-
runs-on: ubuntu-latest
177-
steps:
178-
- name: Determine which commit to initially checkout
179-
run: "if [ ${{ github.event_name }} = \"push\" ]; then\n echo \"target_commit=${{\
180-
\ github.sha }}\" >> $GITHUB_ENV\nelse\n echo \"target_commit=${{ github.event.pull_request.head.sha\
181-
\ }}\" >> $GITHUB_ENV\nfi\n"
182-
- name: Git checkout
183-
uses: actions/checkout@v3
184-
with:
185-
fetch-depth: 0
186-
ref: ${{ env.target_commit }}
187-
- name: Determine which commit to test
188-
run: "if [ ${{ github.event_name }} = \"push\" ]; then\n echo \"tested_commit=${{\
189-
\ github.sha }}\" >> $GITHUB_ENV\nelse\n merge_commit=$(git ls-remote ${{\
190-
\ github.event.repository.html_url }} refs/pull/${{ github.event.number }}/merge\
191-
\ | cut -f1)\n mergeable=$(git merge --no-commit --no-ff ${{ github.event.pull_request.base.sha\
192-
\ }} > /dev/null 2>&1; echo $?; git merge --abort > /dev/null 2>&1 || true)\n\
193-
\ if [ -z \"$merge_commit\" -o \"x$mergeable\" != \"x0\" ]; then\n echo\
194-
\ \"tested_commit=${{ github.event.pull_request.head.sha }}\" >> $GITHUB_ENV\n\
195-
\ else\n echo \"tested_commit=$merge_commit\" >> $GITHUB_ENV\n fi\nfi\n"
196-
- name: Git checkout
197-
uses: actions/checkout@v3
198-
with:
199-
fetch-depth: 0
200-
ref: ${{ env.tested_commit }}
201-
- name: Cachix install
202-
uses: cachix/install-nix-action@v27
203-
with:
204-
nix_path: nixpkgs=channel:nixpkgs-unstable
205-
- name: Cachix setup coq-elpi
206-
uses: cachix/cachix-action@v15
207-
with:
208-
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
209-
extraPullNames: coq, coq-community, math-comp
210-
name: coq-elpi
211-
- id: stepCheck
212-
name: Checking presence of CI target deriving
213-
run: "nb_dry_run=$(NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link \\\n --argstr\
214-
\ bundle \"coq-master\" --argstr job \"deriving\" \\\n --dry-run 2>&1 >\
215-
\ /dev/null)\necho $nb_dry_run\necho status=$(echo $nb_dry_run | grep \"built:\"\
216-
\ | sed \"s/.*/built/\") >> $GITHUB_OUTPUT\n"
217-
- if: steps.stepCheck.outputs.status == 'built'
218-
name: 'Building/fetching previous CI target: coq'
219-
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-master"
220-
--argstr job "coq"
221-
- if: steps.stepCheck.outputs.status == 'built'
222-
name: 'Building/fetching previous CI target: mathcomp-ssreflect'
223-
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-master"
224-
--argstr job "mathcomp-ssreflect"
225-
- if: steps.stepCheck.outputs.status == 'built'
226-
name: Building/fetching current CI target
227-
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-master"
228-
--argstr job "deriving"
229173
hierarchy-builder:
230174
needs:
231175
- coq-elpi
@@ -1188,62 +1132,6 @@ jobs:
11881132
name: Building/fetching current CI target
11891133
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-master"
11901134
--argstr job "odd-order"
1191-
reglang:
1192-
needs:
1193-
- mathcomp-ssreflect
1194-
runs-on: ubuntu-latest
1195-
steps:
1196-
- name: Determine which commit to initially checkout
1197-
run: "if [ ${{ github.event_name }} = \"push\" ]; then\n echo \"target_commit=${{\
1198-
\ github.sha }}\" >> $GITHUB_ENV\nelse\n echo \"target_commit=${{ github.event.pull_request.head.sha\
1199-
\ }}\" >> $GITHUB_ENV\nfi\n"
1200-
- name: Git checkout
1201-
uses: actions/checkout@v3
1202-
with:
1203-
fetch-depth: 0
1204-
ref: ${{ env.target_commit }}
1205-
- name: Determine which commit to test
1206-
run: "if [ ${{ github.event_name }} = \"push\" ]; then\n echo \"tested_commit=${{\
1207-
\ github.sha }}\" >> $GITHUB_ENV\nelse\n merge_commit=$(git ls-remote ${{\
1208-
\ github.event.repository.html_url }} refs/pull/${{ github.event.number }}/merge\
1209-
\ | cut -f1)\n mergeable=$(git merge --no-commit --no-ff ${{ github.event.pull_request.base.sha\
1210-
\ }} > /dev/null 2>&1; echo $?; git merge --abort > /dev/null 2>&1 || true)\n\
1211-
\ if [ -z \"$merge_commit\" -o \"x$mergeable\" != \"x0\" ]; then\n echo\
1212-
\ \"tested_commit=${{ github.event.pull_request.head.sha }}\" >> $GITHUB_ENV\n\
1213-
\ else\n echo \"tested_commit=$merge_commit\" >> $GITHUB_ENV\n fi\nfi\n"
1214-
- name: Git checkout
1215-
uses: actions/checkout@v3
1216-
with:
1217-
fetch-depth: 0
1218-
ref: ${{ env.tested_commit }}
1219-
- name: Cachix install
1220-
uses: cachix/install-nix-action@v27
1221-
with:
1222-
nix_path: nixpkgs=channel:nixpkgs-unstable
1223-
- name: Cachix setup coq-elpi
1224-
uses: cachix/cachix-action@v15
1225-
with:
1226-
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
1227-
extraPullNames: coq, coq-community, math-comp
1228-
name: coq-elpi
1229-
- id: stepCheck
1230-
name: Checking presence of CI target reglang
1231-
run: "nb_dry_run=$(NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link \\\n --argstr\
1232-
\ bundle \"coq-master\" --argstr job \"reglang\" \\\n --dry-run 2>&1 > /dev/null)\n\
1233-
echo $nb_dry_run\necho status=$(echo $nb_dry_run | grep \"built:\" | sed \"\
1234-
s/.*/built/\") >> $GITHUB_OUTPUT\n"
1235-
- if: steps.stepCheck.outputs.status == 'built'
1236-
name: 'Building/fetching previous CI target: coq'
1237-
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-master"
1238-
--argstr job "coq"
1239-
- if: steps.stepCheck.outputs.status == 'built'
1240-
name: 'Building/fetching previous CI target: mathcomp-ssreflect'
1241-
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-master"
1242-
--argstr job "mathcomp-ssreflect"
1243-
- if: steps.stepCheck.outputs.status == 'built'
1244-
name: Building/fetching current CI target
1245-
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-master"
1246-
--argstr job "reglang"
12471135
vcfloat:
12481136
needs:
12491137
- interval

‎.nix/config.nix‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@
2727
mathcomp-single-planB-src.job = false;
2828
mathcomp-single-planB.job = false;
2929
mathcomp-single.job = false;
30+
31+
deriving.job = false;
32+
reglang.job = false;
3033
};
3134

3235
"coq-master".coqPackages = {
@@ -52,6 +55,9 @@
5255
mathcomp-single-planB-src.job = false;
5356
mathcomp-single-planB.job = false;
5457
mathcomp-single.job = false;
58+
59+
deriving.job = false;
60+
reglang.job = false;
5561
};
5662

5763
};

0 commit comments

Comments
 (0)