From be828d255d48095296b7b58963744d6f447026b2 Mon Sep 17 00:00:00 2001 From: Mirek Kratochvil Date: Sun, 8 May 2022 13:23:15 +0200 Subject: [PATCH 1/3] use the prebuilt container for CIs --- .github/workflows/main.yml | 26 ++++---------------------- .gitlab-ci.yml | 18 +++++++++++++++--- README.md | 2 +- 3 files changed, 20 insertions(+), 26 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 558eeee..06300b9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,27 +1,20 @@ name: CI -# Controls when the action will run. on: - # Triggers the workflow on push or pull request events but only for the master branch push: branches: [ master ] pull_request: branches: [ master ] - # Allows you to run this workflow manually from the Actions tab workflow_dispatch: -# A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: - # This workflow contains a single job called "build" build: - # The type of runner that the job will run on + name: Build thesis PDFs runs-on: ubuntu-latest container: { image: 'aergus/latex' } - # Steps represent a sequence of tasks that will be executed as part of the job steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v2 - name: Build the thesis run: latexmk thesis && latexmk abstract-cz && latexmk abstract-en @@ -36,20 +29,9 @@ jobs: name: Verify PDF/A runs-on: ubuntu-latest needs: build + container: { image: 'ghcr.io/mff-cuni-cz/cuni-thesis-validator' } steps: - - name: Checkout verifier - uses: actions/checkout@v2 - with: - repository: mff-cuni-cz/cuni-thesis-validator - ref: ba1d9e7be0b70782bf19643eb9a7627ec046dfb7 - - name: Build verifier Docker image - run: docker build -t thesis-validator . - - name: Download artifacts - uses: actions/download-artifact@v2 - with: - name: Thesis - - name: Run verifier + - name: Run VeraPDF run: > - docker run --rm -i -v $PWD:/thesis thesis-validator verify - /thesis/*.pdf | tee /dev/stderr | grep -qE 'nonCompliant="0"' + verify *.pdf | tee /dev/stderr | grep -qE 'nonCompliant="0"' diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 19c841c..576b112 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,12 +4,24 @@ # # It works with the gitlab.mff.cuni.cz instance. # -image: aergus/latex -build: - script: latexmk thesis && latexmk abstract-cz && latexmk abstract-en; +stages: + - build + - verify + +latexmk: + stage: build + image: aergus/latex + script: | + latexmk thesis && latexmk abstract-cz && latexmk abstract-en; artifacts: paths: - thesis.pdf - abstract-cz.pdf - abstract-en.pdf + +verapdf: + stage: verify + image: ghcr.io/mff-cuni-cz/cuni-thesis-validator + script: | + verify *.pdf |tee /dev/stderr |grep -qE 'nonCompliant="0"' diff --git a/README.md b/README.md index 9e737c6..dc1b683 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ docker run -u $UID -ti --rm -v $PWD:/th -w /th aergus/latex make ## PDF/A -With a bit of luck, you should get a valid PDF/A right out of LaTeX. +With a bit of luck, you should get a valid PDF/A right out of LaTeX. If you are using GitHub actions or GitLab CI, the CI will run the PDF/A verifier automatically for you. A PDF/A validator that can point out exact problems is available here: https://github.com/mff-cuni-cz/cuni-thesis-validator From e78346ca9bf7dae6ebb494c0943b056d1b213fcc Mon Sep 17 00:00:00 2001 From: Mirek Kratochvil Date: Sun, 8 May 2022 13:27:12 +0200 Subject: [PATCH 2/3] fix the github pipeline --- .github/workflows/main.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 06300b9..b8d456d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,10 +1,7 @@ name: CI on: - push: - branches: [ master ] pull_request: - branches: [ master ] workflow_dispatch: @@ -19,7 +16,7 @@ jobs: - name: Build the thesis run: latexmk thesis && latexmk abstract-cz && latexmk abstract-en - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: Thesis path: | @@ -32,6 +29,7 @@ jobs: container: { image: 'ghcr.io/mff-cuni-cz/cuni-thesis-validator' } steps: + - name: Get PDFs + uses: actions/download-artifact@v3 - name: Run VeraPDF - run: > - verify *.pdf | tee /dev/stderr | grep -qE 'nonCompliant="0"' + run: verify Thesis/*.pdf | tee /dev/stderr | grep -qE 'nonCompliant="0"' From 3cca434b03041042b6713680fa3ec3e61ed15552 Mon Sep 17 00:00:00 2001 From: Mirek Kratochvil Date: Sun, 8 May 2022 20:19:52 +0200 Subject: [PATCH 3/3] switch to a temporary validator image location --- .github/workflows/main.yml | 2 +- .gitlab-ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b8d456d..e81fe6c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,7 +26,7 @@ jobs: name: Verify PDF/A runs-on: ubuntu-latest needs: build - container: { image: 'ghcr.io/mff-cuni-cz/cuni-thesis-validator' } + container: { image: 'ghcr.io/exaexa/cuni-thesis-validator' } steps: - name: Get PDFs diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 576b112..c98d2c7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,6 +22,6 @@ latexmk: verapdf: stage: verify - image: ghcr.io/mff-cuni-cz/cuni-thesis-validator + image: ghcr.io/exaexa/cuni-thesis-validator script: | verify *.pdf |tee /dev/stderr |grep -qE 'nonCompliant="0"'