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.

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

Update CI #98

Merged
merged 2 commits into from
May 28, 2024
Merged
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
18 changes: 5 additions & 13 deletions .github/workflows/docker-action.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This file was generated from `meta.yml` using the coq-community templates and
# then patched to support the test-suite. Be careful when regenerating it.
# This file was generated from `meta.yml`, please do not edit manually.
# Follow the instructions on https://github.com/coq-community/templates to regenerate.
name: Docker CI

on:
Expand Down Expand Up @@ -28,8 +28,6 @@ jobs:
- 'mathcomp/mathcomp:2.2.0-coq-8.18'
- 'mathcomp/mathcomp:2.2.0-coq-8.19'
- 'mathcomp/mathcomp:2.2.0-coq-dev'
- 'mathcomp/mathcomp-dev:coq-8.16'
- 'mathcomp/mathcomp-dev:coq-8.17'
- 'mathcomp/mathcomp-dev:coq-8.18'
- 'mathcomp/mathcomp-dev:coq-8.19'
- 'mathcomp/mathcomp-dev:coq-dev'
Expand All @@ -40,15 +38,9 @@ jobs:
with:
opam_file: 'coq-mathcomp-algebra-tactics.opam'
custom_image: ${{ matrix.image }}
after_script: |
startGroup "Run tests"
sudo chown -R coq:coq .
make test-suite TEST_SKIP_BUILD=1
endGroup
- name: Revert permissions
if: ${{ always() }}
run: sudo chown -R 1001:116 .

export: 'OPAMWITHTEST'
env:
OPAMWITHTEST: true

# See also:
# https://github.com/coq-community/docker-coq-action#readme
Expand Down
1 change: 1 addition & 0 deletions Make.test-suite
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@ examples/ring_examples_no_check.v
examples/from_sander.v
examples/lra_examples.v

-R theories mathcomp.algebra_tactics
-R examples mathcomp.algebra_tactics.examples
-arg -w -arg -notation-overridden
12 changes: 2 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,6 @@ KNOWNFILES := Makefile Make Make.test-suite

.DEFAULT_GOAL := invoke-coqmakefile

ifneq "$(TEST_SKIP_BUILD)" ""
TEST_DEP :=
LIBRARY_PATH :=
else
TEST_DEP := invoke-coqmakefile
LIBRARY_PATH := -R theories mathcomp.algebra_tactics
endif

COQMAKEFILE = $(COQBIN)coq_makefile
COQMAKE = $(MAKE) --no-print-directory -f Makefile.coq
COQMAKE_TESTSUITE = $(MAKE) --no-print-directory -f Makefile.test-suite.coq
Expand All @@ -25,12 +17,12 @@ Makefile.coq: Makefile Make
$(COQMAKEFILE) -f Make -o Makefile.coq

Makefile.test-suite.coq: Makefile Make.test-suite
$(COQMAKEFILE) -f Make.test-suite $(LIBRARY_PATH) -o Makefile.test-suite.coq
$(COQMAKEFILE) -f Make.test-suite -o Makefile.test-suite.coq

invoke-coqmakefile: Makefile.coq
$(COQMAKE) $(filter-out $(KNOWNTARGETS),$(MAKECMDGOALS))

test-suite: Makefile.test-suite.coq $(TEST_DEP)
test-suite: Makefile.test-suite.coq invoke-coqmakefile
$(COQMAKE_TESTSUITE)

theories/%.vo: Makefile.coq
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ Follow the instructions on https://github.com/coq-community/templates to regener

[![Docker CI][docker-action-shield]][docker-action-link]

[docker-action-shield]: https://github.com/math-comp/algebra-tactics/workflows/Docker%20CI/badge.svg?branch=master
[docker-action-link]: https://github.com/math-comp/algebra-tactics/actions?query=workflow:"Docker%20CI"
[docker-action-shield]: https://github.com/math-comp/algebra-tactics/actions/workflows/docker-action.yml/badge.svg?branch=master
[docker-action-link]: https://github.com/math-comp/algebra-tactics/actions/workflows/docker-action.yml



Expand Down
1 change: 1 addition & 0 deletions coq-mathcomp-algebra-tactics.opam
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ automatically push down ring morphisms and additive functions to leaves of
ring/field expressions before applying the proof procedures."""

build: [make "-j%{jobs}%"]
run-test: [make "-j%{jobs}%" "test-suite"]
install: [make "install"]
depends: [
"coq" {>= "8.16"}
Expand Down
10 changes: 6 additions & 4 deletions meta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,6 @@ tested_coq_opam_versions:
repo: 'mathcomp/mathcomp'
- version: '2.2.0-coq-dev'
repo: 'mathcomp/mathcomp'
- version: 'coq-8.16'
repo: 'mathcomp/mathcomp-dev'
- version: 'coq-8.17'
repo: 'mathcomp/mathcomp-dev'
- version: 'coq-8.18'
repo: 'mathcomp/mathcomp-dev'
- version: 'coq-8.19'
Expand Down Expand Up @@ -100,8 +96,14 @@ dependencies:
description: |-
[Coq-Elpi](https://github.com/LPCIC/coq-elpi) 1.15.0 or later (known not to work with 1.17.0)

test_target: test-suite
namespace: mathcomp.algebra_tactics

action_appendix: |2-
export: 'OPAMWITHTEST'
env:
OPAMWITHTEST: true

documentation: |-

## Documentation
Expand Down
Loading