From 889758b3fbe8ecf1a00b37581aec45e4b5a290f9 Mon Sep 17 00:00:00 2001 From: Enrico Tassi Date: Wed, 20 Sep 2023 11:21:16 +0200 Subject: [PATCH 1/3] prepare release --- Changelog.md | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 87e09e71b..b4dc0c633 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,6 +1,18 @@ # Changelog -## UNRELEASED +## [1.6.0] - 2023-09-20 + +Compatible with +- Coq 8.16 with Coq-Elpi 1.15.x and 1.16.x +- Coq 8.17 with Coq-Elpi 1.17.x and 1.18.x +- Coq 8.18 with Coq-Elpi 1.19.x +This version is required if Elpi is >= 1.17.0 + +### General + +- **Speedup** speedup in coercion compression +- **Speedup** accumulate clauses in batches (on Coq-Elpi >= 8.18.0) +- **Change** remove generation of eta expanded instances (was unused) ## [1.5.0] - 2023-08-04 From 6020e05e3bc938c00b9ecf06a370066df4cbd555 Mon Sep 17 00:00:00 2001 From: Enrico Tassi Date: Wed, 20 Sep 2023 11:25:59 +0200 Subject: [PATCH 2/3] fix opam --- coq-hierarchy-builder.opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coq-hierarchy-builder.opam b/coq-hierarchy-builder.opam index f8f6f85ef..501bd2054 100644 --- a/coq-hierarchy-builder.opam +++ b/coq-hierarchy-builder.opam @@ -12,7 +12,7 @@ build: [ [ make "build"] [ make "test-suite" ] {with-test} ] install: [ make "install" ] -depends: [ "coq-elpi" { (>= "1.15" & < "1.20~") | = "dev" } ] +depends: [ "coq-elpi" { (>= "1.16" & < "1.20~") | = "dev" } ] conflicts: [ "coq-hierarchy-builder-shim" ] synopsis: "High level commands to declare and evolve a hierarchy based on packed classes" description: """ From d61dd8ce8b5b3e013b2859e5fe6dd1a1ed8aed71 Mon Sep 17 00:00:00 2001 From: Enrico Tassi Date: Wed, 20 Sep 2023 15:55:43 +0200 Subject: [PATCH 3/3] release ci job --- .github/workflows/main.yml | 58 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 362d353ee..aaff4d484 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7,6 +7,7 @@ name: docker CI on: push: branches: [ master ] + tags: [ "v*.*.*" ] pull_request: branches: [ master ] @@ -62,3 +63,60 @@ jobs: ./coq.hb reset `find . -name \*.v` mv _CoqProject.test-suite.bak _CoqProject.test-suite git diff --exit-code + + release: + runs-on: ubuntu-latest + if: startsWith(github.ref, 'refs/tags/') + needs: [opam] + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Inject slug/short variables + uses: rlespinasse/github-slug-action@v4 + + - name: Create archive + run: | + VERSION="${GITHUB_REF_NAME_SLUG#v}" + git archive -o hierarchy-builder-$VERSION.tar.gz --prefix=hierarchy-builder-$VERSION/ $GITHUB_SHA . + + - name: Release + uses: softprops/action-gh-release@v1 + with: + files: hierarchy-builder-*.tar.gz + fail_on_unmatched_files: true + prerelease: true + generate_release_notes: true + name: Hierarchy Builder ${{ github.ref }} + + - name: Use OCaml 4.14.x + uses: avsm/setup-ocaml@v2 + with: + ocaml-compiler: 4.14.x + opam-local-packages: | + !coq-hierarchy-builder*.opam + + - name: Write PAT + env: + OPAM_PUBLISH_TOKEN: ${{ secrets.OPAM_PUBLISH_TOKEN }} + run: | + mkdir -p ~/.opam/plugins/opam-publish + printf "$OPAM_PUBLISH_TOKEN" > ~/.opam/plugins/opam-publish/coqelpibot.token + + - name: Setup SSH + uses: webfactory/ssh-agent@v0.8.0 + with: + ssh-private-key: ${{ secrets.BOT_SSH_KEY }} + + - name: Install opam-publish # 2.0.3 because more recent versions do not respect OPAMYES + run: opam install -y -j 2 opam-publish=2.0.3 + + - name: Publish + run: | + eval $(opam env) + git config --global user.name coqelpibot + git config --global user.email coqelpibot@inria.fr + OPAM_SUITE=released + TAG=`git tag --sort=-v:refname|head -1` + opam-publish --tag=$TAG --packages-directory=$OPAM_SUITE/packages --repo=coq/opam --no-browser -v ${TAG##v} https://github.com/math-comp/hierarchy-builder/releases/download/$TAG/hierarchy-builder-${TAG##v}.tar.gz +