diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml deleted file mode 100644 index c5243c3..0000000 --- a/.github/workflows/deploy-docs.yml +++ /dev/null @@ -1,59 +0,0 @@ -name: Build and Deploy documentation - -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 aac-tactics" - make -j "$(nproc)" - endGroup - startGroup "Build coqdoc" - make coqdoc - endGroup - startGroup "Build ocamldoc" - make ocamldoc - 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 deleted file mode 100644 index 8f70750..0000000 --- a/.github/workflows/docker-action.yml +++ /dev/null @@ -1,31 +0,0 @@ -# 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: - push: - branches: - - master - pull_request: - branches: - - '**' - -jobs: - build: - # the OS must be GNU/Linux to be able to use the docker-coq-action - runs-on: ubuntu-latest - strategy: - matrix: - image: - - 'coqorg/coq:dev' - fail-fast: false - steps: - - uses: actions/checkout@v2 - - uses: coq-community/docker-coq-action@v1 - with: - opam_file: 'coq-aac-tactics.opam' - custom_image: ${{ matrix.image }} - -# See also: -# https://github.com/coq-community/docker-coq-action#readme -# https://github.com/erikmd/docker-coq-github-action-demo diff --git a/.github/workflows/nix-action.yml b/.github/workflows/nix-action.yml index 9224ff8..7f8305c 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.17 pull_request: paths: - .github/workflows/** @@ -17,7 +17,7 @@ jobs: strategy: matrix: overrides: - - 'coq = "master"' + - 'coq = "8.17"' fail-fast: false steps: - name: Determine which commit to test @@ -40,7 +40,7 @@ jobs: name: coq-community authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' extraPullNames: coq, math-comp - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: ref: ${{ env.tested_commit }} - run: > diff --git a/README.md b/README.md index c35ca82..e5513d2 100644 --- a/README.md +++ b/README.md @@ -4,19 +4,12 @@ Follow the instructions on https://github.com/coq-community/templates to regener ---> # AAC Tactics -[![Docker CI][docker-action-shield]][docker-action-link] -[![Nix CI][nix-action-shield]][nix-action-link] [![Contributing][contributing-shield]][contributing-link] [![Code of Conduct][conduct-shield]][conduct-link] [![Zulip][zulip-shield]][zulip-link] [![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-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-link]: https://github.com/coq-community/aac-tactics/actions?query=workflow:"Nix%20CI" [contributing-shield]: https://img.shields.io/badge/contributions-welcome-%23f7931e.svg [contributing-link]: https://github.com/coq-community/manifesto/blob/master/CONTRIBUTING.md @@ -49,8 +42,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.17 (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 4184b12..c1b6e5b 100644 --- a/coq-aac-tactics.opam +++ b/coq-aac-tactics.opam @@ -3,7 +3,7 @@ opam-version: "2.0" maintainer: "palmskog@gmail.com" -version: "dev" +version: "8.17.dev" homepage: "https://github.com/coq-community/aac-tactics" dev-repo: "git+https://github.com/coq-community/aac-tactics.git" @@ -23,7 +23,7 @@ build: ["dune" "build" "-p" name "-j" jobs] depends: [ "ocaml" {>= "4.09.0"} "dune" {>= "2.5"} - "coq" {= "dev"} + "coq" {>= "8.17" & < "8.18"} ] tags: [ diff --git a/meta.yml b/meta.yml index 9309ff3..89c0eb5 100644 --- a/meta.yml +++ b/meta.yml @@ -3,11 +3,11 @@ fullname: AAC Tactics shortname: aac-tactics organization: coq-community community: true -action: true +action: false nix: true plugin: true doi: 10.1007/978-3-642-25379-9_14 -branch: master +branch: v8.17 coqdoc: true coqdoc_index: docs/coqdoc/toc.html @@ -42,25 +42,25 @@ maintainers: opam-file-maintainer: palmskog@gmail.com -opam-file-version: dev +opam-file-version: 8.17.dev license: fullname: GNU Lesser General Public License v3.0 or later 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.17 (use the corresponding branch or release for other Coq versions) + opam: '{>= "8.17" & < "8.18"}' supported_ocaml_versions: text: 4.09.0 or later opam: '{>= "4.09.0"}' tested_coq_nix_versions: -- coq_version: 'master' +- coq_version: '8.17' tested_coq_opam_versions: -- version: dev +- version: '8.17' namespace: AAC_tactics