Skip to content

Commit 162e9ea

Browse files
committed
[CI] Check warning free compilation on Rocq 9.2
Instead of Rocq 9.1
1 parent 6a206ce commit 162e9ea

3 files changed

Lines changed: 56 additions & 56 deletions

File tree

.github/workflows/nix-action-rocq-9.1.yml

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -5008,60 +5008,6 @@ jobs:
50085008
name: Building/fetching current CI target
50095009
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
50105010
"rocq-9.1" --argstr job "stdlib-refman-html"
5011-
stdlib-warnings:
5012-
needs: []
5013-
runs-on: ubuntu-latest
5014-
steps:
5015-
- name: Determine which commit to initially checkout
5016-
run: "if [ ${{ github.event_name }} = \"push\" ]; then\n echo \"target_commit=${{
5017-
github.sha }}\" >> $GITHUB_ENV\nelse\n echo \"target_commit=${{ github.event.pull_request.head.sha
5018-
}}\" >> $GITHUB_ENV\nfi\n"
5019-
- name: Git checkout
5020-
uses: actions/checkout@v6
5021-
with:
5022-
fetch-depth: 0
5023-
ref: ${{ env.target_commit }}
5024-
- name: Determine which commit to test
5025-
run: "if [ ${{ github.event_name }} = \"push\" ]; then\n echo \"tested_commit=${{
5026-
github.sha }}\" >> $GITHUB_ENV\nelse\n merge_commit=$(git ls-remote ${{ github.event.repository.html_url
5027-
}} refs/pull/${{ github.event.number }}/merge | cut -f1)\n mergeable=$(git
5028-
merge --no-commit --no-ff ${{ github.event.pull_request.base.sha }} > /dev/null
5029-
2>&1; echo $?; git merge --abort > /dev/null 2>&1 || true)\n if [ -z \"$merge_commit\"\
5030-
\ -o \"x$mergeable\" != \"x0\" ]; then\n echo \"tested_commit=${{ github.event.pull_request.head.sha
5031-
}}\" >> $GITHUB_ENV\n else\n echo \"tested_commit=$merge_commit\" >> $GITHUB_ENV\n\
5032-
\ fi\nfi\n"
5033-
- name: Git checkout
5034-
uses: actions/checkout@v6
5035-
with:
5036-
fetch-depth: 0
5037-
ref: ${{ env.tested_commit }}
5038-
- name: Cachix install
5039-
uses: cachix/install-nix-action@v31
5040-
with:
5041-
nix_path: nixpkgs=channel:nixpkgs-unstable
5042-
- name: Cachix setup coq
5043-
uses: cachix/cachix-action@v16
5044-
with:
5045-
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
5046-
extraPullNames: coq-community, math-comp
5047-
name: coq
5048-
- id: stepGetDerivation
5049-
name: Getting derivation for current job (stdlib-warnings)
5050-
run: "NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link \\\n --argstr bundle
5051-
\"rocq-9.1\" --argstr job \"stdlib-warnings\" \\\n --dry-run 2> err > out
5052-
|| (touch fail; true)\ncat out err\nif [ -e fail ]; then echo \"Error: getting
5053-
derivation failed\"; exit 1; fi\n"
5054-
- id: stepCheck
5055-
name: Checking presence of CI target for current job
5056-
run: "if $(cat out err | grep -q \"built:\") ; then\n echo \"CI target needs
5057-
actual building\"\n if $(cat out err | grep -q \"derivations will be built:\"\
5058-
) ; then\n echo \"waiting a bit for derivations that should be in cache\"\
5059-
\n sleep 30\n fi\nelse\n echo \"CI target already built\"\n echo \"\
5060-
status=fetched\" >> $GITHUB_OUTPUT\nfi\n"
5061-
- if: steps.stepCheck.outputs.status != 'fetched'
5062-
name: Building/fetching current CI target
5063-
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
5064-
"rocq-9.1" --argstr job "stdlib-warnings"
50655011
stdpp:
50665012
needs:
50675013
- coq

.github/workflows/nix-action-rocq-9.2.yml

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4827,6 +4827,60 @@ jobs:
48274827
name: Building/fetching current CI target
48284828
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
48294829
"rocq-9.2" --argstr job "stdlib-refman-html"
4830+
stdlib-warnings:
4831+
needs: []
4832+
runs-on: ubuntu-latest
4833+
steps:
4834+
- name: Determine which commit to initially checkout
4835+
run: "if [ ${{ github.event_name }} = \"push\" ]; then\n echo \"target_commit=${{
4836+
github.sha }}\" >> $GITHUB_ENV\nelse\n echo \"target_commit=${{ github.event.pull_request.head.sha
4837+
}}\" >> $GITHUB_ENV\nfi\n"
4838+
- name: Git checkout
4839+
uses: actions/checkout@v6
4840+
with:
4841+
fetch-depth: 0
4842+
ref: ${{ env.target_commit }}
4843+
- name: Determine which commit to test
4844+
run: "if [ ${{ github.event_name }} = \"push\" ]; then\n echo \"tested_commit=${{
4845+
github.sha }}\" >> $GITHUB_ENV\nelse\n merge_commit=$(git ls-remote ${{ github.event.repository.html_url
4846+
}} refs/pull/${{ github.event.number }}/merge | cut -f1)\n mergeable=$(git
4847+
merge --no-commit --no-ff ${{ github.event.pull_request.base.sha }} > /dev/null
4848+
2>&1; echo $?; git merge --abort > /dev/null 2>&1 || true)\n if [ -z \"$merge_commit\"\
4849+
\ -o \"x$mergeable\" != \"x0\" ]; then\n echo \"tested_commit=${{ github.event.pull_request.head.sha
4850+
}}\" >> $GITHUB_ENV\n else\n echo \"tested_commit=$merge_commit\" >> $GITHUB_ENV\n\
4851+
\ fi\nfi\n"
4852+
- name: Git checkout
4853+
uses: actions/checkout@v6
4854+
with:
4855+
fetch-depth: 0
4856+
ref: ${{ env.tested_commit }}
4857+
- name: Cachix install
4858+
uses: cachix/install-nix-action@v31
4859+
with:
4860+
nix_path: nixpkgs=channel:nixpkgs-unstable
4861+
- name: Cachix setup coq
4862+
uses: cachix/cachix-action@v16
4863+
with:
4864+
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
4865+
extraPullNames: coq-community, math-comp
4866+
name: coq
4867+
- id: stepGetDerivation
4868+
name: Getting derivation for current job (stdlib-warnings)
4869+
run: "NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link \\\n --argstr bundle
4870+
\"rocq-9.2\" --argstr job \"stdlib-warnings\" \\\n --dry-run 2> err > out
4871+
|| (touch fail; true)\ncat out err\nif [ -e fail ]; then echo \"Error: getting
4872+
derivation failed\"; exit 1; fi\n"
4873+
- id: stepCheck
4874+
name: Checking presence of CI target for current job
4875+
run: "if $(cat out err | grep -q \"built:\") ; then\n echo \"CI target needs
4876+
actual building\"\n if $(cat out err | grep -q \"derivations will be built:\"\
4877+
) ; then\n echo \"waiting a bit for derivations that should be in cache\"\
4878+
\n sleep 30\n fi\nelse\n echo \"CI target already built\"\n echo \"\
4879+
status=fetched\" >> $GITHUB_OUTPUT\nfi\n"
4880+
- if: steps.stepCheck.outputs.status != 'fetched'
4881+
name: Building/fetching current CI target
4882+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
4883+
"rocq-9.2" --argstr job "stdlib-warnings"
48304884
stdpp:
48314885
needs:
48324886
- coq

.nix/config.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,8 @@ with builtins; with (import <nixpkgs> {}).lib;
284284
}; };
285285
"rocq-9.2" = { rocqPackages = common-bundles // {
286286
rocq-core.override.version = "9.2";
287+
# check that we compile without warnings on last release of Rocq
288+
stdlib-warnings.job = true;
287289
# plugin pins, from v9.2 branch of Rocq
288290
bignums.override.version = "30a45625546da0a88db8689a8009d580aa3f557f";
289291
stdlib-test.job = false;
@@ -319,8 +321,6 @@ with builtins; with (import <nixpkgs> {}).lib;
319321
{ name = p; value.job = false; })); };
320322
"rocq-9.1" = { rocqPackages = common-bundles // {
321323
rocq-core.override.version = "9.1";
322-
# check that we compile without warnings on last release of Rocq
323-
stdlib-warnings.job = true;
324324
# plugin pins, from v9.1 branch of Rocq
325325
bignums.override.version = "9f9855536bd4167af6986f826819e32354b7da22";
326326
stdlib-test.job = false;

0 commit comments

Comments
 (0)