Skip to content

Commit

Permalink
Merge pull request math-comp#1316 from proux01/ci-update
Browse files Browse the repository at this point in the history
[CI] Update Nix toolbox
  • Loading branch information
proux01 authored Dec 21, 2024
2 parents c416c78 + b42a966 commit fe6be9c
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 65 deletions.
62 changes: 0 additions & 62 deletions .github/workflows/nix-action-coq-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1247,68 +1247,6 @@ jobs:
name: Building/fetching current CI target
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-master"
--argstr job "mathcomp-classical"
mathcomp-doc:
needs:
- coq
- stdlib
- hierarchy-builder
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 math-comp
uses: cachix/cachix-action@v15
with:
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
extraPullNames: coq, coq-community
name: math-comp
- id: stepCheck
name: Checking presence of CI target mathcomp-doc
run: "nb_dry_run=$(NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link \\\n --argstr
bundle \"coq-master\" --argstr job \"mathcomp-doc\" \\\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"
--argstr job "coq"
- if: steps.stepCheck.outputs.status == 'built'
name: 'Building/fetching previous CI target: stdlib'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-master"
--argstr job "stdlib"
- if: steps.stepCheck.outputs.status == 'built'
name: 'Building/fetching previous CI target: hierarchy-builder'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-master"
--argstr job "hierarchy-builder"
- 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 "mathcomp-doc"
mathcomp-experimental-reals:
needs:
- coq
Expand Down
1 change: 1 addition & 0 deletions .nix/config.nix
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ with builtins; with (import <nixpkgs> {}).lib;
coquelicot.job = false;
coqeal.job = false; # currently broken by https://github.com/coq/coq/pull/19228
mathcomp-apery.job = false; # reverse dependency of coqeal
mathcomp-doc.job = false; # currently broken (it's an unmaintainable pile of scripts)
};
"coq-master".ocamlPackages = { elpi.override.version = "2.0.6"; };
"coq-8.20".coqPackages = common-bundles // {
Expand Down
2 changes: 1 addition & 1 deletion .nix/coq-nix-toolbox.nix
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"fb3515feec422e546de863ad0101e2a51ec9b8db"
"5cd4fd84c8ee7d09c8ec69d46a4f9baea34263e6"
4 changes: 2 additions & 2 deletions default.nix
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/coq-community/coq-nix-toolbox.git";
ref = "master";
url = "https://github.com/proux01/coq-nix-toolbox.git";
ref = "rocq-master";
# putting a ref here is strongly advised
rev = import .nix/coq-nix-toolbox.nix;
};
Expand Down

0 comments on commit fe6be9c

Please sign in to comment.