Skip to content

Commit 2e4192e

Browse files
committed
[CI] Further fix
1 parent ea5d731 commit 2e4192e

File tree

2 files changed

+1
-96
lines changed

2 files changed

+1
-96
lines changed

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

Lines changed: 0 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -322,102 +322,6 @@ jobs:
322322
name: Building/fetching current CI target
323323
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "master"
324324
--argstr job "mathcomp-analysis"
325-
mathcomp-analysis-single:
326-
needs:
327-
- coq
328-
- mathcomp-finmap
329-
- mathcomp-bigenough
330-
- mathcomp-bigenough
331-
- stdlib
332-
- hierarchy-builder
333-
runs-on: ubuntu-latest
334-
steps:
335-
- name: Determine which commit to initially checkout
336-
run: "if [ ${{ github.event_name }} = \"push\" ]; then\n echo \"target_commit=${{
337-
github.sha }}\" >> $GITHUB_ENV\nelse\n echo \"target_commit=${{ github.event.pull_request.head.sha
338-
}}\" >> $GITHUB_ENV\nfi\n"
339-
- name: Git checkout
340-
uses: actions/checkout@v4
341-
with:
342-
fetch-depth: 0
343-
ref: ${{ env.target_commit }}
344-
- name: Determine which commit to test
345-
run: "if [ ${{ github.event_name }} = \"push\" ]; then\n echo \"tested_commit=${{
346-
github.sha }}\" >> $GITHUB_ENV\nelse\n merge_commit=$(git ls-remote ${{ github.event.repository.html_url
347-
}} refs/pull/${{ github.event.number }}/merge | cut -f1)\n mergeable=$(git
348-
merge --no-commit --no-ff ${{ github.event.pull_request.base.sha }} > /dev/null
349-
2>&1; echo $?; git merge --abort > /dev/null 2>&1 || true)\n if [ -z \"$merge_commit\"\
350-
\ -o \"x$mergeable\" != \"x0\" ]; then\n echo \"tested_commit=${{ github.event.pull_request.head.sha
351-
}}\" >> $GITHUB_ENV\n else\n echo \"tested_commit=$merge_commit\" >> $GITHUB_ENV\n\
352-
\ fi\nfi\n"
353-
- name: Git checkout
354-
uses: actions/checkout@v4
355-
with:
356-
fetch-depth: 0
357-
ref: ${{ env.tested_commit }}
358-
- name: Cachix install
359-
uses: cachix/install-nix-action@v31
360-
with:
361-
nix_path: nixpkgs=channel:nixpkgs-unstable
362-
- name: Cachix setup math-comp
363-
uses: cachix/cachix-action@v16
364-
with:
365-
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
366-
extraPullNames: coq, coq-community
367-
name: math-comp
368-
- id: stepGetDerivation
369-
name: Getting derivation for current job (mathcomp-analysis-single)
370-
run: "NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link \\\n --argstr bundle
371-
\"master\" --argstr job \"mathcomp-analysis-single\" \\\n --dry-run 2> err
372-
> out || (touch fail; true)\ncat out err\nif [ -e fail ]; then echo \"Error:
373-
getting derivation failed\"; exit 1; fi\n"
374-
- id: stepCheck
375-
name: Checking presence of CI target for current job
376-
run: "if $(cat out err | grep -q \"built:\") ; then\n echo \"CI target needs
377-
actual building\"\n if $(cat out err | grep -q \"derivations will be built:\"\
378-
) ; then\n echo \"waiting a bit for derivations that should be in cache\"\
379-
\n sleep 30\n fi\nelse\n echo \"CI target already built\"\n echo \"\
380-
status=fetched\" >> $GITHUB_OUTPUT\nfi\n"
381-
- if: steps.stepCheck.outputs.status != 'fetched'
382-
name: 'Building/fetching previous CI target: coq'
383-
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "master"
384-
--argstr job "coq"
385-
- if: steps.stepCheck.outputs.status != 'fetched'
386-
name: 'Building/fetching previous CI target: mathcomp-ssreflect'
387-
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "master"
388-
--argstr job "mathcomp-ssreflect"
389-
- if: steps.stepCheck.outputs.status != 'fetched'
390-
name: 'Building/fetching previous CI target: mathcomp-algebra'
391-
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "master"
392-
--argstr job "mathcomp-algebra"
393-
- if: steps.stepCheck.outputs.status != 'fetched'
394-
name: 'Building/fetching previous CI target: mathcomp-finmap'
395-
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "master"
396-
--argstr job "mathcomp-finmap"
397-
- if: steps.stepCheck.outputs.status != 'fetched'
398-
name: 'Building/fetching previous CI target: mathcomp-bigenough'
399-
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "master"
400-
--argstr job "mathcomp-bigenough"
401-
- if: steps.stepCheck.outputs.status != 'fetched'
402-
name: 'Building/fetching previous CI target: mathcomp-field'
403-
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "master"
404-
--argstr job "mathcomp-field"
405-
- if: steps.stepCheck.outputs.status != 'fetched'
406-
name: 'Building/fetching previous CI target: mathcomp-bigenough'
407-
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "master"
408-
--argstr job "mathcomp-bigenough"
409-
- if: steps.stepCheck.outputs.status != 'fetched'
410-
name: 'Building/fetching previous CI target: stdlib'
411-
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "master"
412-
--argstr job "stdlib"
413-
- if: steps.stepCheck.outputs.status != 'fetched'
414-
name: 'Building/fetching previous CI target: hierarchy-builder'
415-
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "master"
416-
--argstr job "hierarchy-builder"
417-
- if: steps.stepCheck.outputs.status != 'fetched'
418-
name: Building/fetching current CI target
419-
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "master"
420-
--argstr job "mathcomp-analysis-single"
421325
mathcomp-bigenough:
422326
needs:
423327
- coq

.nix/config.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ in
7979
mathcomp-finmap.override.version = "master";
8080
ssprove.job = false;
8181
mathcomp-analysis-stdlib.job = false; # because of the interval dependency
82+
mathcomp-analysis-single.job = false; # same
8283
}; };
8384

8485
## Cachix caches to use in CI

0 commit comments

Comments
 (0)