Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 0 additions & 5 deletions .github/workflows/nix-action-rocq-9.0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ jobs:
mathcomp-algebra:
needs:
- rocq-core
- micromega-plugin
runs-on: ubuntu-latest
steps:
- name: Determine which commit to initially checkout
Expand Down Expand Up @@ -126,10 +125,6 @@ jobs:
name: 'Building/fetching previous CI target: hierarchy-builder'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
"rocq-9.0" --argstr job "hierarchy-builder"
- if: steps.stepCheck.outputs.status != 'fetched'
name: 'Building/fetching previous CI target: micromega-plugin'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
"rocq-9.0" --argstr job "micromega-plugin"
- if: steps.stepCheck.outputs.status != 'fetched'
name: Building/fetching current CI target
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
Expand Down
487 changes: 483 additions & 4 deletions .github/workflows/nix-action-rocq-9.1.yml

Large diffs are not rendered by default.

213 changes: 196 additions & 17 deletions .github/workflows/nix-action-rocq-9.2.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,68 @@
jobs:
bignums:
needs:
- rocq-core
- stdlib
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@v6
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@v6
with:
fetch-depth: 0
ref: ${{ env.tested_commit }}
- name: Cachix install
uses: cachix/install-nix-action@v31
with:
nix_path: nixpkgs=channel:nixpkgs-unstable
- name: Cachix setup coq-community
uses: cachix/cachix-action@v16
with:
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
extraPullNames: coq, math-comp
name: coq-community
- id: stepGetDerivation
name: Getting derivation for current job (bignums)
run: "NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link \\\n --argstr bundle
\"rocq-9.2\" --argstr job \"bignums\" \\\n --dry-run 2> err > out || (touch
fail; true)\ncat out err\nif [ -e fail ]; then echo \"Error: getting derivation
failed\"; exit 1; fi\n"
- id: stepCheck
name: Checking presence of CI target for current job
run: "if $(cat out err | grep -q \"built:\") ; then\n echo \"CI target needs
actual building\"\n if $(cat out err | grep -q \"derivations will be built:\"\
) ; then\n echo \"waiting a bit for derivations that should be in cache\"\
\n sleep 30\n fi\nelse\n echo \"CI target already built\"\n echo \"\
status=fetched\" >> $GITHUB_OUTPUT\nfi\n"
- if: steps.stepCheck.outputs.status != 'fetched'
name: 'Building/fetching previous CI target: rocq-core'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
"rocq-9.2" --argstr job "rocq-core"
- if: steps.stepCheck.outputs.status != 'fetched'
name: 'Building/fetching previous CI target: stdlib'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
"rocq-9.2" --argstr job "stdlib"
- if: steps.stepCheck.outputs.status != 'fetched'
name: Building/fetching current CI target
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
"rocq-9.2" --argstr job "bignums"
coq:
needs:
- rocq-core
Expand Down Expand Up @@ -121,11 +185,11 @@ jobs:
name: Building/fetching current CI target
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
"rocq-9.2" --argstr job "hierarchy-builder"
mathcomp-algebra:
iris:
needs:
- rocq-core
- hierarchy-builder
- micromega-plugin
- stdlib
- stdpp
runs-on: ubuntu-latest
steps:
- name: Determine which commit to initially checkout
Expand Down Expand Up @@ -162,11 +226,11 @@ jobs:
extraPullNames: coq, math-comp
name: coq-community
- id: stepGetDerivation
name: Getting derivation for current job (mathcomp-algebra)
name: Getting derivation for current job (iris)
run: "NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link \\\n --argstr bundle
\"rocq-9.2\" --argstr job \"mathcomp-algebra\" \\\n --dry-run 2> err > out
|| (touch fail; true)\ncat out err\nif [ -e fail ]; then echo \"Error: getting
derivation failed\"; exit 1; fi\n"
\"rocq-9.2\" --argstr job \"iris\" \\\n --dry-run 2> err > out || (touch
fail; true)\ncat out err\nif [ -e fail ]; then echo \"Error: getting derivation
failed\"; exit 1; fi\n"
- id: stepCheck
name: Checking presence of CI target for current job
run: "if $(cat out err | grep -q \"built:\") ; then\n echo \"CI target needs
Expand All @@ -179,21 +243,67 @@ jobs:
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
"rocq-9.2" --argstr job "rocq-core"
- if: steps.stepCheck.outputs.status != 'fetched'
name: 'Building/fetching previous CI target: mathcomp-order'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
"rocq-9.2" --argstr job "mathcomp-order"
- if: steps.stepCheck.outputs.status != 'fetched'
name: 'Building/fetching previous CI target: mathcomp-fingroup'
name: 'Building/fetching previous CI target: stdlib'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
"rocq-9.2" --argstr job "mathcomp-fingroup"
"rocq-9.2" --argstr job "stdlib"
- if: steps.stepCheck.outputs.status != 'fetched'
name: 'Building/fetching previous CI target: hierarchy-builder'
name: 'Building/fetching previous CI target: stdpp'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
"rocq-9.2" --argstr job "hierarchy-builder"
"rocq-9.2" --argstr job "stdpp"
- if: steps.stepCheck.outputs.status != 'fetched'
name: 'Building/fetching previous CI target: micromega-plugin'
name: Building/fetching current CI target
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
"rocq-9.2" --argstr job "micromega-plugin"
"rocq-9.2" --argstr job "iris"
mathcomp-algebra:
needs: []
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@v6
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@v6
with:
fetch-depth: 0
ref: ${{ env.tested_commit }}
- name: Cachix install
uses: cachix/install-nix-action@v31
with:
nix_path: nixpkgs=channel:nixpkgs-unstable
- name: Cachix setup coq-community
uses: cachix/cachix-action@v16
with:
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
extraPullNames: coq, math-comp
name: coq-community
- id: stepGetDerivation
name: Getting derivation for current job (mathcomp-algebra)
run: "NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link \\\n --argstr bundle
\"rocq-9.2\" --argstr job \"mathcomp-algebra\" \\\n --dry-run 2> err > out
|| (touch fail; true)\ncat out err\nif [ -e fail ]; then echo \"Error: getting
derivation failed\"; exit 1; fi\n"
- id: stepCheck
name: Checking presence of CI target for current job
run: "if $(cat out err | grep -q \"built:\") ; then\n echo \"CI target needs
actual building\"\n if $(cat out err | grep -q \"derivations will be built:\"\
) ; then\n echo \"waiting a bit for derivations that should be in cache\"\
\n sleep 30\n fi\nelse\n echo \"CI target already built\"\n echo \"\
status=fetched\" >> $GITHUB_OUTPUT\nfi\n"
- if: steps.stepCheck.outputs.status != 'fetched'
name: Building/fetching current CI target
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
Expand Down Expand Up @@ -314,6 +424,7 @@ jobs:
stdlib:
needs:
- rocq-core
- micromega-plugin
runs-on: ubuntu-latest
steps:
- name: Determine which commit to initially checkout
Expand Down Expand Up @@ -366,10 +477,78 @@ jobs:
name: 'Building/fetching previous CI target: rocq-core'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
"rocq-9.2" --argstr job "rocq-core"
- if: steps.stepCheck.outputs.status != 'fetched'
name: 'Building/fetching previous CI target: micromega-plugin'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
"rocq-9.2" --argstr job "micromega-plugin"
- if: steps.stepCheck.outputs.status != 'fetched'
name: Building/fetching current CI target
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
"rocq-9.2" --argstr job "stdlib"
stdpp:
needs:
- rocq-core
- stdlib
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@v6
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@v6
with:
fetch-depth: 0
ref: ${{ env.tested_commit }}
- name: Cachix install
uses: cachix/install-nix-action@v31
with:
nix_path: nixpkgs=channel:nixpkgs-unstable
- name: Cachix setup coq-community
uses: cachix/cachix-action@v16
with:
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
extraPullNames: coq, math-comp
name: coq-community
- id: stepGetDerivation
name: Getting derivation for current job (stdpp)
run: "NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link \\\n --argstr bundle
\"rocq-9.2\" --argstr job \"stdpp\" \\\n --dry-run 2> err > out || (touch
fail; true)\ncat out err\nif [ -e fail ]; then echo \"Error: getting derivation
failed\"; exit 1; fi\n"
- id: stepCheck
name: Checking presence of CI target for current job
run: "if $(cat out err | grep -q \"built:\") ; then\n echo \"CI target needs
actual building\"\n if $(cat out err | grep -q \"derivations will be built:\"\
) ; then\n echo \"waiting a bit for derivations that should be in cache\"\
\n sleep 30\n fi\nelse\n echo \"CI target already built\"\n echo \"\
status=fetched\" >> $GITHUB_OUTPUT\nfi\n"
- if: steps.stepCheck.outputs.status != 'fetched'
name: 'Building/fetching previous CI target: rocq-core'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
"rocq-9.2" --argstr job "rocq-core"
- if: steps.stepCheck.outputs.status != 'fetched'
name: 'Building/fetching previous CI target: stdlib'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
"rocq-9.2" --argstr job "stdlib"
- if: steps.stepCheck.outputs.status != 'fetched'
name: Building/fetching current CI target
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
"rocq-9.2" --argstr job "stdpp"
name: Nix CI for bundle rocq-9.2
on:
pull_request:
Expand Down
30 changes: 6 additions & 24 deletions .github/workflows/nix-action-rocq-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -182,10 +182,7 @@ jobs:
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
"rocq-master" --argstr job "hierarchy-builder"
mathcomp-algebra:
needs:
- rocq-core
- hierarchy-builder
- micromega-plugin
needs: []
runs-on: ubuntu-latest
steps:
- name: Determine which commit to initially checkout
Expand Down Expand Up @@ -234,26 +231,6 @@ jobs:
) ; then\n echo \"waiting a bit for derivations that should be in cache\"\
\n sleep 30\n fi\nelse\n echo \"CI target already built\"\n echo \"\
status=fetched\" >> $GITHUB_OUTPUT\nfi\n"
- if: steps.stepCheck.outputs.status != 'fetched'
name: 'Building/fetching previous CI target: rocq-core'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
"rocq-master" --argstr job "rocq-core"
- if: steps.stepCheck.outputs.status != 'fetched'
name: 'Building/fetching previous CI target: mathcomp-order'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
"rocq-master" --argstr job "mathcomp-order"
- if: steps.stepCheck.outputs.status != 'fetched'
name: 'Building/fetching previous CI target: mathcomp-fingroup'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
"rocq-master" --argstr job "mathcomp-fingroup"
- if: steps.stepCheck.outputs.status != 'fetched'
name: 'Building/fetching previous CI target: hierarchy-builder'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
"rocq-master" --argstr job "hierarchy-builder"
- if: steps.stepCheck.outputs.status != 'fetched'
name: 'Building/fetching previous CI target: micromega-plugin'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
"rocq-master" --argstr job "micromega-plugin"
- if: steps.stepCheck.outputs.status != 'fetched'
name: Building/fetching current CI target
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
Expand Down Expand Up @@ -428,6 +405,7 @@ jobs:
stdlib:
needs:
- rocq-core
- micromega-plugin
runs-on: ubuntu-latest
steps:
- name: Determine which commit to initially checkout
Expand Down Expand Up @@ -480,6 +458,10 @@ jobs:
name: 'Building/fetching previous CI target: rocq-core'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
"rocq-master" --argstr job "rocq-core"
- if: steps.stepCheck.outputs.status != 'fetched'
name: 'Building/fetching previous CI target: micromega-plugin'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
"rocq-master" --argstr job "micromega-plugin"
- if: steps.stepCheck.outputs.status != 'fetched'
name: Building/fetching current CI target
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
Expand Down
2 changes: 1 addition & 1 deletion .nix/config.nix
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ with builtins; with (import <nixpkgs> {}).lib;
# for a complete list of Coq packages available in Nix
# * <github_login>:<branch> is such that this will use the branch <branch>
# from https://github.com/<github_login>/<repository>
stdlib.override.version = "proux01:tify";
};
coq-common-bundles = listToAttrs (forEach coq-master (p:
{ name = p; value.override.version = "master"; }))
Expand Down Expand Up @@ -124,7 +125,6 @@ with builtins; with (import <nixpkgs> {}).lib;
}; coqPackages = coq-common-bundles // {
coq.override.version = "master";
coq-elpi.override.version = "master";
coq-elpi.override.elpi-version = "3.6.2";
hierarchy-builder.override.version = "master";
coquelicot.job = false;
interval.job = false;
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 @@
"175e68be5dcde92457dbb949ef905e771d765a68"
"20731ec68fcf2772869a7d80da55b08723781827"
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/rocq-community/coq-nix-toolbox.git";
ref = "master";
url = "https://github.com/proux01/coq-nix-toolbox.git";
ref = "micromega";
rev = import .nix/coq-nix-toolbox.nix;
};
in
Expand Down
12 changes: 6 additions & 6 deletions src/dune
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
(library
(name micromega_ml_plugin)
(modules (:standard \ csdpcert g_zify zify))
(public_name rocq-micromega-plugin.plugin)
(modules (:standard \ csdpcert g_tify tify))
(public_name rocq-micromega-plugin.plugin)
(flags :standard -w -27)
(preprocess
(pps ppx_optcomp -- -cookie "ppx_optcomp.env=env ~rocq:(Defined \"%{coq:version.major}.%{coq:version.minor}\")"))
(libraries rocq-runtime.plugins.ltac rocq-runtime.vernac))

(library
(name zify_ml_plugin)
(public_name rocq-micromega-plugin.zify)
(modules g_zify zify)
(name tify_ml_plugin)
(public_name rocq-micromega-plugin.tify)
(modules g_tify tify)
(preprocess
(pps ppx_optcomp -- -cookie "ppx_optcomp.env=env ~rocq:(Defined \"%{coq:version.major}.%{coq:version.minor}\")"))
(libraries rocq-runtime.plugins.ltac))

(coq.pp
(modules g_micromega g_zify))
(modules g_micromega g_tify))
Loading
Loading