diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0651c9a..5924ce1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,3 +1,9 @@ +# 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 env: @@ -25,7 +31,7 @@ jobs: sudo apt install texlive-latex-base texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended xsltproc latexmk cm-super - name: Build the document - run: make archdiag0.pdf archdiag1.pdf archdiag2.pdf biblio forcetex + run: make - name: Check the output run: | @@ -37,4 +43,3 @@ jobs: with: path: ${{ env.doc_name }}.pdf - diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml new file mode 100644 index 0000000..2d75e67 --- /dev/null +++ b/.github/workflows/preview.yml @@ -0,0 +1,66 @@ +# 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: IVOAArchitecture + +on: + push: + branches: + - main + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + + - name: Checkout the repository + uses: actions/checkout@v1 + 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 + + - name: Build the document + run: make ${{ 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. + 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. + 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 }} diff --git a/Makefile b/Makefile index ea44095..a624cac 100644 --- a/Makefile +++ b/Makefile @@ -30,14 +30,14 @@ AUX_FILES = include ivoatex/Makefile -archdiag2.svg: archdiag-full.xml ivoatex/make-archdiag.xslt - $(XSLTPROC) -o $@ ivoatex/make-archdiag.xslt archdiag-full.xml +#archdiag2.svg: archdiag-full.xml ivoatex/make-archdiag.xslt +# $(XSLTPROC) -o $@ ivoatex/make-archdiag.xslt archdiag-full.xml -archdiag1.svg: ivoatex/make-archdiag.xslt - echo '' | $(XSLTPROC) -o $@ ivoatex/make-archdiag.xslt - +#archdiag1.svg: ivoatex/make-archdiag.xslt +# echo '' | $(XSLTPROC) -o $@ ivoatex/make-archdiag.xslt - -archdiag0.svg: ivoatex/make-archdiag.xslt - echo '' | $(XSLTPROC) -o $@ ivoatex/make-archdiag.xslt - +#archdiag0.svg: ivoatex/make-archdiag.xslt +# echo '' | $(XSLTPROC) -o $@ ivoatex/make-archdiag.xslt - diff --git a/README.md b/README.md index 2b06bcf..05d9825 100644 --- a/README.md +++ b/README.md @@ -3,11 +3,15 @@ This is the home for the IVOA Architecture Note that is produced by the Technical Coordination Group (TCG). This document was created and is updated periodically to describe the design concepts behind existing and new IVOA standards. The original -note was published in 2010 and this 2021 update is the first since that date. +note was published in 2010 and updated in 2021. The document is expected to be updated +approximately once every three (3) years around the end of a TCG chair's term. # Status -Under development. +The draft version (2024 update) is: +[![PDF-Preview](https://img.shields.io/badge/Preview-PDF-blue)](../../releases/download/auto-pdf-preview/IVOAArchitecture-draft.pdf) + +The released version of this document is: https://www.ivoa.net/Documents/IVOAArchitecture/20211101 # Working on this Document diff --git a/archdiag0.pdf b/archdiag0.pdf new file mode 100644 index 0000000..d2460c4 Binary files /dev/null and b/archdiag0.pdf differ diff --git a/archdiag1.pdf b/archdiag1.pdf new file mode 100644 index 0000000..b4f0102 Binary files /dev/null and b/archdiag1.pdf differ diff --git a/archdiag2.pdf b/archdiag2.pdf new file mode 100644 index 0000000..df5c108 Binary files /dev/null and b/archdiag2.pdf differ diff --git a/ivoatex b/ivoatex index 32ef905..85a59fe 160000 --- a/ivoatex +++ b/ivoatex @@ -1 +1 @@ -Subproject commit 32ef905325659abe9a355c4029718bdea1b6e62b +Subproject commit 85a59fe8e6abd86bbe3ef4e12fd3dade71a54924