From a576e0ab0491573769ecf323d8115ad6a465bc58 Mon Sep 17 00:00:00 2001 From: Mark Taylor Date: Wed, 27 Nov 2024 11:47:10 +0000 Subject: [PATCH 1/6] update ivoatex --- ivoatex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ivoatex b/ivoatex index 8a5ab67..6e85903 160000 --- a/ivoatex +++ b/ivoatex @@ -1 +1 @@ -Subproject commit 8a5ab67d28836682665109c08c8002e273a9ce9f +Subproject commit 6e85903d20274c02a1754929d1a639c27f124e18 From f6c7eabd97ff62b50ef6b69de30e5b86913678fc Mon Sep 17 00:00:00 2001 From: Mark Taylor Date: Wed, 27 Nov 2024 11:48:59 +0000 Subject: [PATCH 2/6] update CI by running make update-ci --- .github/workflows/build.yml | 43 +++++++++++++------- .github/workflows/preview.yml | 76 +++++++++++++++++++---------------- 2 files changed, 70 insertions(+), 49 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9475d00..bf55cdd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,6 +1,15 @@ -name: CI build of the standard +# This file generated from a template file maintained in the ivoatex repository. +# To create and install it into a project repository, do: +# make github-preview +# git commit +# git push +# +name: Check the IVOA document -on: +env: + doc_name: DALI + +on: pull_request: types: [opened, synchronize, reopened] @@ -8,25 +17,31 @@ jobs: build: runs-on: ubuntu-latest - + steps: - - uses: actions/checkout@v1 + + - name: Checkout the repository + uses: actions/checkout@v4 with: submodules: true + - name: Setup dependencies run: | sudo apt update - sudo apt install texlive-latex-base texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended xsltproc ghostscript cm-super librsvg2-bin inkscape - + sudo apt install texlive-latex-base texlive-latex-recommended \ + texlive-latex-extra texlive-fonts-recommended + pdftk xsltproc latexmk cm-super + - name: Build the document - run: make role_diagram.pdf biblio forcetex - + run: make + - name: Check the output run: | - test -f DALI.pdf - test -f DALI.bbl - - - uses: actions/upload-artifact@v1 + test -f ${{ env.doc_name }}.pdf + test -f ${{ env.doc_name }}.bbl + + - name: Keep the PDF artefact + uses: actions/upload-artifact@v4 with: - name: DALI.pdf Preview - path: DALI.pdf + name: PDF Preview + path: ${{ env.doc_name }}.pdf diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index 90d88ba..68701a2 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -1,7 +1,15 @@ +# This file generated from a template file maintained in the ivoatex repository. +# To create and install it into a project repository, do: +# make github-preview +# git commit +# git push +# name: Update PDF Preview env: - doc_name: DALI + doc_name : + branch_name: ${{ github.head_ref || github.ref_name }} + tag_preview: auto-pdf-preview on: push: @@ -10,51 +18,49 @@ on: jobs: build: - + runs-on: ubuntu-latest - + steps: - + - name: Checkout the repository - uses: actions/checkout@v1 + uses: actions/checkout@v4 with: submodules: true - + - name: Setup dependencies run: | - sudo apt update - sudo apt install texlive-latex-base texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended xsltproc latexmk cm-super - sudo snap install pdftk - + sudo apt install texlive-latex-base texlive-latex-recommended \ + texlive-latex-extra texlive-fonts-recommended + pdftk xsltproc latexmk cm-super + - name: Build the document - run: make ${{ env.doc_name }}-draft.pdf - + run: make biblio ${{ env.doc_name }}-draft.pdf + - name: Check the output run: | test -f ${{ env.doc_name }}-draft.pdf test -f ${{ env.doc_name }}.bbl - - - name: Move the auto-pdf-preview tag - uses: weareyipyip/walking-tag-action@v2 - with: - tag-name: auto-pdf-preview - tag-message: | - Last commit taken into account for the automatically updated PDF preview of this IVOA document. + + - name: Remove the former PDF preview + run: | + gh release delete ${{ env.tag_preview }} --cleanup-tag --yes env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Update the PDF preview - uses: Xotl/cool-github-releases@v1 - with: - mode: update - isPrerelease: true - tag_name: auto-pdf-preview - release_name: "Auto PDF Preview" - body_mrkdwn: | - This release aims to provide a PDF preview of the last commit applied on this repository. + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Upload the new PDF preview + run: | + RELEASE_NOTES="This release aims to provide a PDF preview of the last commit applied on this repository. It will be updated automatically after each merge of a PullRequest. - **DO NOT PUBLISH THIS PRE-RELEASE!**" - _Corresponding commit: ${{ github.sha }}_ - assets: ${{ env.doc_name }}-draft.pdf - replace_assets: true - github_token: ${{ secrets.GITHUB_TOKEN }} + **DO NOT PUBLISH THIS PRE-RELEASE!** + _Corresponding commit: ${{ github.sha }}_" + + gh release create ${{ env.tag_preview }} \ + ${{ env.doc_name }}-draft.pdf \ + --prerelease \ + --target "${{ env.branch_name }}" \ + --title 'Auto PDF Preview' \ + --notes "$RELEASE_NOTES" + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + From 961f4a63ef72af9310ebf427044eeee65d3dec86 Mon Sep 17 00:00:00 2001 From: Mark Taylor Date: Wed, 27 Nov 2024 12:21:32 +0000 Subject: [PATCH 3/6] update ivoatex to master --- ivoatex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ivoatex b/ivoatex index 6e85903..b605650 160000 --- a/ivoatex +++ b/ivoatex @@ -1 +1 @@ -Subproject commit 6e85903d20274c02a1754929d1a639c27f124e18 +Subproject commit b60565021acc93683e7adf4e874fa9fdbd1dc235 From 390b8516f81316cca5abfb9f68bc1d683588635e Mon Sep 17 00:00:00 2001 From: Mark Taylor Date: Wed, 27 Nov 2024 13:29:56 +0000 Subject: [PATCH 4/6] update ivoatex to fix-pdftk --- ivoatex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ivoatex b/ivoatex index b605650..520769d 160000 --- a/ivoatex +++ b/ivoatex @@ -1 +1 @@ -Subproject commit b60565021acc93683e7adf4e874fa9fdbd1dc235 +Subproject commit 520769d70a75f5f3dd8d618afbe8c2361071d440 From 3d5f9a6da3cf57d8b151871de27ab9b454e13689 Mon Sep 17 00:00:00 2001 From: Mark Taylor Date: Wed, 27 Nov 2024 13:31:45 +0000 Subject: [PATCH 5/6] update CI by running make update-ci --- .github/workflows/build.yml | 2 +- .github/workflows/preview.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bf55cdd..c3bdd9b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,7 +29,7 @@ jobs: run: | sudo apt update sudo apt install texlive-latex-base texlive-latex-recommended \ - texlive-latex-extra texlive-fonts-recommended + texlive-latex-extra texlive-fonts-recommended \ pdftk xsltproc latexmk cm-super - name: Build the document diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index 68701a2..f1c9d8f 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -31,7 +31,7 @@ jobs: - name: Setup dependencies run: | sudo apt install texlive-latex-base texlive-latex-recommended \ - texlive-latex-extra texlive-fonts-recommended + texlive-latex-extra texlive-fonts-recommended \ pdftk xsltproc latexmk cm-super - name: Build the document From 0cb974204119613ea2fd6910d0690097393ff0f1 Mon Sep 17 00:00:00 2001 From: Mark Taylor Date: Wed, 27 Nov 2024 14:03:24 +0000 Subject: [PATCH 6/6] update ivoatex to commit on master --- ivoatex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ivoatex b/ivoatex index 520769d..e17140d 160000 --- a/ivoatex +++ b/ivoatex @@ -1 +1 @@ -Subproject commit 520769d70a75f5f3dd8d618afbe8c2361071d440 +Subproject commit e17140d3ce9fa57d28b8e2b1a88cfbc4090bd5ad