diff --git a/.github/workflows/deploy-coqdoc.yml b/.github/workflows/deploy-coqdoc.yml deleted file mode 100644 index f17cce9..0000000 --- a/.github/workflows/deploy-coqdoc.yml +++ /dev/null @@ -1,53 +0,0 @@ -name: Build and Deploy coqdoc - -on: - push: - branches: - - master - pull_request: - branches: - - '**' - -jobs: - build-coqdoc: - runs-on: ubuntu-latest - steps: - - name: Set up Git repository - uses: actions/checkout@v2 - - - name: Build coqdoc - uses: coq-community/docker-coq-action@v1 - with: - custom_image: 'coqorg/coq:dev' - custom_script: | - {{before_install}} - startGroup "Build aac-tactics dependencies" - opam pin add -n -y -k path coq-aac-tactics . - opam update -y - opam install -y -j "$(nproc)" coq-aac-tactics --deps-only - endGroup - startGroup "Add permissions" - sudo chown -R coq:coq . - endGroup - startGroup "Build coqdoc" - make -j "$(nproc)" coqdoc - endGroup - - - name: Revert Coq user permissions - # to avoid a warning at cleanup time - if: ${{ always() }} - run: sudo chown -R 1001:116 . - - - name: Copy HTML and CSS and JavaScript - run: | - mkdir public - cp -r resources/index.html docs/ public/ - - - name: Deploy to GitHub pages - if: github.event_name == 'push' && github.ref == 'refs/heads/master' - uses: crazy-max/ghaction-github-pages@v2 - with: - build_dir: public - jekyll: false - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/docker-action.yml b/.github/workflows/docker-action.yml index 8f70750..e7aa197 100644 --- a/.github/workflows/docker-action.yml +++ b/.github/workflows/docker-action.yml @@ -5,7 +5,7 @@ name: Docker CI on: push: branches: - - master + - v8.16 pull_request: branches: - '**' @@ -17,7 +17,7 @@ jobs: strategy: matrix: image: - - 'coqorg/coq:dev' + - 'coqorg/coq:8.16' fail-fast: false steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/nix-action.yml b/.github/workflows/nix-action.yml index 9224ff8..d1e49a9 100644 --- a/.github/workflows/nix-action.yml +++ b/.github/workflows/nix-action.yml @@ -5,7 +5,7 @@ name: Nix CI on: push: branches: - - master + - v8.16 pull_request: paths: - .github/workflows/** @@ -17,7 +17,7 @@ jobs: strategy: matrix: overrides: - - 'coq = "master"' + - 'coq = "8.16"' fail-fast: false steps: - name: Determine which commit to test diff --git a/README.md b/README.md index c35ca82..1fd11fd 100644 --- a/README.md +++ b/README.md @@ -12,10 +12,10 @@ Follow the instructions on https://github.com/coq-community/templates to regener [![coqdoc][coqdoc-shield]][coqdoc-link] [![DOI][doi-shield]][doi-link] -[docker-action-shield]: https://github.com/coq-community/aac-tactics/workflows/Docker%20CI/badge.svg?branch=master +[docker-action-shield]: https://github.com/coq-community/aac-tactics/workflows/Docker%20CI/badge.svg?branch=v8.16 [docker-action-link]: https://github.com/coq-community/aac-tactics/actions?query=workflow:"Docker%20CI" -[nix-action-shield]: https://github.com/coq-community/aac-tactics/workflows/Nix%20CI/badge.svg?branch=master +[nix-action-shield]: https://github.com/coq-community/aac-tactics/workflows/Nix%20CI/badge.svg?branch=v8.16 [nix-action-link]: https://github.com/coq-community/aac-tactics/actions?query=workflow:"Nix%20CI" [contributing-shield]: https://img.shields.io/badge/contributions-welcome-%23f7931e.svg @@ -49,8 +49,8 @@ such as for binary integer arithmetic and booleans, are provided with the plugin - Coq-community maintainer(s): - Karl Palmskog ([**@palmskog**](https://github.com/palmskog)) - License: [GNU Lesser General Public License v3.0 or later](LICENSE) -- Compatible Coq versions: master (use the corresponding branch or release for other Coq versions) -- Compatible OCaml versions: 4.05.0 or later +- Compatible Coq versions: 8.16 (use the corresponding branch or release for other Coq versions) +- Compatible OCaml versions: 4.09.0 or later - Additional dependencies: none - Coq namespace: `AAC_tactics` - Related publication(s): diff --git a/coq-aac-tactics.opam b/coq-aac-tactics.opam index 28ddd03..121b518 100644 --- a/coq-aac-tactics.opam +++ b/coq-aac-tactics.opam @@ -8,6 +8,7 @@ version: "dev" homepage: "https://github.com/coq-community/aac-tactics" dev-repo: "git+https://github.com/coq-community/aac-tactics.git" bug-reports: "https://github.com/coq-community/aac-tactics/issues" +doc: "https://coq-community.github.io/aac-tactics/" license: "LGPL-3.0-or-later" synopsis: "Coq tactics for rewriting universally quantified equations, modulo associative (and possibly commutative and idempotent) operators" @@ -21,9 +22,9 @@ such as for binary integer arithmetic and booleans, are provided with the plugin build: ["dune" "build" "-p" name "-j" jobs] depends: [ - "ocaml" {>= "4.05.0"} + "ocaml" {>= "4.09.0"} "dune" {>= "2.5"} - "coq" {= "dev"} + "coq" {>= "8.16" & < "8.17~"} ] tags: [ diff --git a/meta.yml b/meta.yml index 95072dd..a0a74ad 100644 --- a/meta.yml +++ b/meta.yml @@ -7,7 +7,7 @@ action: true nix: true plugin: true doi: 10.1007/978-3-642-25379-9_14 -branch: master +branch: 'v8.16' coqdoc: true coqdoc_index: docs/coqdoc/toc.html @@ -49,18 +49,18 @@ license: identifier: LGPL-3.0-or-later supported_coq_versions: - text: master (use the corresponding branch or release for other Coq versions) - opam: '{= "dev"}' + text: 8.16 (use the corresponding branch or release for other Coq versions) + opam: '{>= "8.16" & < "8.17~"}' supported_ocaml_versions: - text: 4.05.0 or later - opam: '{>= "4.05.0"}' + text: 4.09.0 or later + opam: '{>= "4.09.0"}' tested_coq_nix_versions: -- coq_version: 'master' +- coq_version: '8.16' tested_coq_opam_versions: -- version: dev +- version: '8.16' namespace: AAC_tactics