diff --git a/.github/actions/texlive/action.yaml b/.github/actions/texlive/action.yaml index 23fa5820b..cd0f5248e 100644 --- a/.github/actions/texlive/action.yaml +++ b/.github/actions/texlive/action.yaml @@ -2,13 +2,16 @@ name: texlive description: Run commands in a TeXLive docker image inputs: - run: - description: Commands to be executed + run1: + description: Commands to be executed first required: true + run2: + description: Commands to be executed second runs: using: docker image: docker://texlive/texlive:latest entrypoint: .github/actions/texlive/run.sh args: - - ${{ inputs.run }} + - ${{ inputs.run1 }} + - ${{ inputs.run2 }} diff --git a/.github/actions/texlive/run.sh b/.github/actions/texlive/run.sh index 279fda605..34bec16c4 100755 --- a/.github/actions/texlive/run.sh +++ b/.github/actions/texlive/run.sh @@ -11,7 +11,13 @@ git config --global --add safe.directory "$GITHUB_WORKSPACE" || exit for cmd do + mode= + case "$cmd" in + -*) mode=" (ignoring errors)" + cmd="${cmd#-}" + esac + echo - echo "[command]$cmd" - eval "$cmd" || exit + echo "[command]$cmd$mode" + eval "$cmd" || test -n "$mode" || exit done diff --git a/.github/workflows/pr-pdfs.yaml b/.github/workflows/pr-pdfs.yaml index 9c6f87064..616039556 100644 --- a/.github/workflows/pr-pdfs.yaml +++ b/.github/workflows/pr-pdfs.yaml @@ -34,7 +34,8 @@ jobs: uses: ./.github/actions/texlive if: ${{ env.changed }} with: - run: make ${{ env.pdfs }} && make -k OLD=$mergebase_sha NEW=HEAD ${{ env.diffs }} + run1: make ${{ env.pdfs }} + run2: -make -k OLD=$mergebase_sha NEW=HEAD ${{ env.diffs }} - uses: actions/upload-artifact@v3 with: