Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CI] Update Nix toolbox #735

Merged
merged 1 commit into from
Dec 16, 2024
Merged

[CI] Update Nix toolbox #735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 60 additions & 0 deletions .github/workflows/nix-action-coq-master-min-elpi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ jobs:
coq-elpi:
needs:
- coq
- stdlib
runs-on: ubuntu-latest
steps:
- name: Determine which commit to initially checkout
Expand Down Expand Up @@ -162,6 +163,7 @@ jobs:
mathcomp:
needs:
- coq
- stdlib
- mathcomp-ssreflect
- mathcomp-fingroup
- mathcomp-algebra
Expand Down Expand Up @@ -253,6 +255,7 @@ jobs:
mathcomp-algebra:
needs:
- coq
- stdlib
- mathcomp-ssreflect
- mathcomp-fingroup
- hierarchy-builder
Expand Down Expand Up @@ -520,6 +523,7 @@ jobs:
mathcomp-character:
needs:
- coq
- stdlib
- mathcomp-ssreflect
- mathcomp-fingroup
- mathcomp-algebra
Expand Down Expand Up @@ -740,6 +744,7 @@ jobs:
mathcomp-field:
needs:
- coq
- stdlib
- mathcomp-ssreflect
- mathcomp-fingroup
- mathcomp-algebra
Expand Down Expand Up @@ -821,6 +826,7 @@ jobs:
mathcomp-fingroup:
needs:
- coq
- stdlib
- mathcomp-ssreflect
- hierarchy-builder
runs-on: ubuntu-latest
Expand Down Expand Up @@ -1150,6 +1156,7 @@ jobs:
mathcomp-solvable:
needs:
- coq
- stdlib
- mathcomp-ssreflect
- mathcomp-fingroup
- mathcomp-algebra
Expand Down Expand Up @@ -1226,6 +1233,7 @@ jobs:
mathcomp-ssreflect:
needs:
- coq
- stdlib
- hierarchy-builder
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -1448,6 +1456,58 @@ jobs:
name: Building/fetching current CI target
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-master-min-elpi"
--argstr job "odd-order"
stdlib:
needs:
- coq
runs-on: ubuntu-latest
steps:
- name: Determine which commit to initially checkout
run: "if [ ${{ github.event_name }} = \"push\" ]; then\n echo \"target_commit=${{
github.sha }}\" >> $GITHUB_ENV\nelse\n echo \"target_commit=${{ github.event.pull_request.head.sha
}}\" >> $GITHUB_ENV\nfi\n"
- name: Git checkout
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ env.target_commit }}
- name: Determine which commit to test
run: "if [ ${{ github.event_name }} = \"push\" ]; then\n echo \"tested_commit=${{
github.sha }}\" >> $GITHUB_ENV\nelse\n merge_commit=$(git ls-remote ${{ github.event.repository.html_url
}} refs/pull/${{ github.event.number }}/merge | cut -f1)\n mergeable=$(git
merge --no-commit --no-ff ${{ github.event.pull_request.base.sha }} > /dev/null
2>&1; echo $?; git merge --abort > /dev/null 2>&1 || true)\n if [ -z \"$merge_commit\"\
\ -o \"x$mergeable\" != \"x0\" ]; then\n echo \"tested_commit=${{ github.event.pull_request.head.sha
}}\" >> $GITHUB_ENV\n else\n echo \"tested_commit=$merge_commit\" >> $GITHUB_ENV\n\
\ fi\nfi\n"
- name: Git checkout
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ env.tested_commit }}
- name: Cachix install
uses: cachix/install-nix-action@v30
with:
nix_path: nixpkgs=channel:nixpkgs-unstable
- name: Cachix setup coq-elpi
uses: cachix/cachix-action@v15
with:
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
extraPullNames: coq, coq-community, math-comp
name: coq-elpi
- id: stepCheck
name: Checking presence of CI target stdlib
run: "nb_dry_run=$(NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link \\\n --argstr
bundle \"coq-master-min-elpi\" --argstr job \"stdlib\" \\\n --dry-run 2>&1
> /dev/null)\necho $nb_dry_run\necho status=$(echo $nb_dry_run | grep \"built:\"\
\ | sed \"s/.*/built/\") >> $GITHUB_OUTPUT\n"
- if: steps.stepCheck.outputs.status == 'built'
name: 'Building/fetching previous CI target: coq'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-master-min-elpi"
--argstr job "coq"
- if: steps.stepCheck.outputs.status == 'built'
name: Building/fetching current CI target
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-master-min-elpi"
--argstr job "stdlib"
name: Nix CI for bundle coq-master-min-elpi
on:
pull_request:
Expand Down
60 changes: 60 additions & 0 deletions .github/workflows/nix-action-coq-master.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ jobs:
coq-elpi:
needs:
- coq
- stdlib
runs-on: ubuntu-latest
steps:
- name: Determine which commit to initially checkout
Expand Down Expand Up @@ -162,6 +163,7 @@ jobs:
mathcomp:
needs:
- coq
- stdlib
- mathcomp-ssreflect
- mathcomp-fingroup
- mathcomp-algebra
Expand Down Expand Up @@ -253,6 +255,7 @@ jobs:
mathcomp-algebra:
needs:
- coq
- stdlib
- mathcomp-ssreflect
- mathcomp-fingroup
- hierarchy-builder
Expand Down Expand Up @@ -520,6 +523,7 @@ jobs:
mathcomp-character:
needs:
- coq
- stdlib
- mathcomp-ssreflect
- mathcomp-fingroup
- mathcomp-algebra
Expand Down Expand Up @@ -740,6 +744,7 @@ jobs:
mathcomp-field:
needs:
- coq
- stdlib
- mathcomp-ssreflect
- mathcomp-fingroup
- mathcomp-algebra
Expand Down Expand Up @@ -821,6 +826,7 @@ jobs:
mathcomp-fingroup:
needs:
- coq
- stdlib
- mathcomp-ssreflect
- hierarchy-builder
runs-on: ubuntu-latest
Expand Down Expand Up @@ -1150,6 +1156,7 @@ jobs:
mathcomp-solvable:
needs:
- coq
- stdlib
- mathcomp-ssreflect
- mathcomp-fingroup
- mathcomp-algebra
Expand Down Expand Up @@ -1226,6 +1233,7 @@ jobs:
mathcomp-ssreflect:
needs:
- coq
- stdlib
- hierarchy-builder
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -1448,6 +1456,58 @@ jobs:
name: Building/fetching current CI target
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-master"
--argstr job "odd-order"
stdlib:
needs:
- coq
runs-on: ubuntu-latest
steps:
- name: Determine which commit to initially checkout
run: "if [ ${{ github.event_name }} = \"push\" ]; then\n echo \"target_commit=${{
github.sha }}\" >> $GITHUB_ENV\nelse\n echo \"target_commit=${{ github.event.pull_request.head.sha
}}\" >> $GITHUB_ENV\nfi\n"
- name: Git checkout
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ env.target_commit }}
- name: Determine which commit to test
run: "if [ ${{ github.event_name }} = \"push\" ]; then\n echo \"tested_commit=${{
github.sha }}\" >> $GITHUB_ENV\nelse\n merge_commit=$(git ls-remote ${{ github.event.repository.html_url
}} refs/pull/${{ github.event.number }}/merge | cut -f1)\n mergeable=$(git
merge --no-commit --no-ff ${{ github.event.pull_request.base.sha }} > /dev/null
2>&1; echo $?; git merge --abort > /dev/null 2>&1 || true)\n if [ -z \"$merge_commit\"\
\ -o \"x$mergeable\" != \"x0\" ]; then\n echo \"tested_commit=${{ github.event.pull_request.head.sha
}}\" >> $GITHUB_ENV\n else\n echo \"tested_commit=$merge_commit\" >> $GITHUB_ENV\n\
\ fi\nfi\n"
- name: Git checkout
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ env.tested_commit }}
- name: Cachix install
uses: cachix/install-nix-action@v30
with:
nix_path: nixpkgs=channel:nixpkgs-unstable
- name: Cachix setup coq-elpi
uses: cachix/cachix-action@v15
with:
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
extraPullNames: coq, coq-community, math-comp
name: coq-elpi
- id: stepCheck
name: Checking presence of CI target stdlib
run: "nb_dry_run=$(NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link \\\n --argstr
bundle \"coq-master\" --argstr job \"stdlib\" \\\n --dry-run 2>&1 > /dev/null)\n
echo $nb_dry_run\necho status=$(echo $nb_dry_run | grep \"built:\" | sed \"\
s/.*/built/\") >> $GITHUB_OUTPUT\n"
- if: steps.stepCheck.outputs.status == 'built'
name: 'Building/fetching previous CI target: coq'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-master"
--argstr job "coq"
- if: steps.stepCheck.outputs.status == 'built'
name: Building/fetching current CI target
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-master"
--argstr job "stdlib"
name: Nix CI for bundle coq-master
on:
pull_request:
Expand Down
2 changes: 1 addition & 1 deletion .nix/coq-nix-toolbox.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"76c44f0123e79740391775e2f977622e2bdc7f26"
"fb3515feec422e546de863ad0101e2a51ec9b8db"
4 changes: 2 additions & 2 deletions default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
bundle ? null, job ? null, inNixShell ? null, src ? ./.,
}@args:
let auto = fetchGit {
url = "https://github.com/proux01/coq-nix-toolbox.git";
ref = "elpi206";
url = "https://github.com/coq-community/coq-nix-toolbox.git";
ref = "master";
rev = import .nix/coq-nix-toolbox.nix;
};
in
Expand Down
Loading