From 995151f6df3768625922c3b2be5d9f4801b3dd3f Mon Sep 17 00:00:00 2001 From: Yishuai Li Date: Tue, 13 Jun 2023 10:27:14 +0800 Subject: [PATCH] CoqdocJs master branch --- .github/workflows/docker-action.yml | 22 +++++++++++----------- Makefile | 1 + coqdocjs | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/workflows/docker-action.yml b/.github/workflows/docker-action.yml index 54a979d..3e804ac 100644 --- a/.github/workflows/docker-action.yml +++ b/.github/workflows/docker-action.yml @@ -14,16 +14,16 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - image: - - 'coqorg/coq:8.9' - - 'coqorg/coq:8.11' - - 'coqorg/coq:8.12' - - 'coqorg/coq:8.13' - - 'coqorg/coq:8.14' - - 'coqorg/coq:8.15' - - 'coqorg/coq:8.16' - - 'coqorg/coq:8.17' - - 'coqorg/coq:dev' + coq: + - '8.9' + - '8.11' + - '8.12' + - '8.13' + - '8.14' + - '8.15' + - '8.16' + - '8.17' + - 'dev' fail-fast: false steps: - uses: actions/checkout@v3 @@ -32,7 +32,7 @@ jobs: - uses: coq-community/docker-coq-action@v1 with: opam_file: 'coq-ext-lib.opam' - custom_image: ${{ matrix.image }} + coq_version: ${{ matrix.coq }} before_script: | startGroup "Workaround permission issue" sudo chown -R coq:coq . diff --git a/Makefile b/Makefile index 2a04800..7034571 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,6 @@ all: theories examples +COQDOCJS_LN?=true -include coqdocjs/Makefile.doc COQMAKEFILE?=Makefile.coq diff --git a/coqdocjs b/coqdocjs index 556b3ab..5740184 160000 --- a/coqdocjs +++ b/coqdocjs @@ -1 +1 @@ -Subproject commit 556b3ab2a3199237cde937fe8ac196cf76099eb8 +Subproject commit 57401849fffb24500c078973a8382dd3086fd2bf