diff options
| author | Gereon Kremer <nafur42@gmail.com> | 2021-10-20 16:45:48 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-20 23:45:48 +0000 |
| commit | f730e8a89b329d029ccae8aa2637bb19a7360f0c (patch) | |
| tree | cc34803f8ec50c3135cd369c8f8030b79287c3b0 /.github | |
| parent | bef33ceaf0a6b69d76b4fd61cb03c990e86bc41c (diff) | |
Fix docs upload (again) (#7435)
This is a follow-up to #7420. This time, I tested the modified code with every combination of values...
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/docs_upload.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.github/workflows/docs_upload.yml b/.github/workflows/docs_upload.yml index f6ee6a0d3..7bdd186a1 100644 --- a/.github/workflows/docs_upload.yml +++ b/.github/workflows/docs_upload.yml @@ -56,7 +56,7 @@ jobs: run: | HASH=${{ github.event.workflow_run.head_commit.id }} ISTAG=${{ startsWith(github.ref, 'refs/tags/') }} - if [ "$ISTAG" ] ; then + if [ "$ISTAG" = true ] ; then NAME=${{ github.event.workflow_run.head_branch }} echo "Identified tag $NAME" elif [ "${{ github.event.workflow_run.event }}" == "push" ] ; then @@ -81,9 +81,9 @@ jobs: mv docs-new target/docs-$NAME-$HASH cd target/ - issame=$(diff -r -x "*.zip" docs-master/ docs-$NAME-$HASH; echo $?; exit 0) + isdiff=$(diff -r -x "*.zip" docs-master/ docs-$NAME-$HASH >&2; echo $?; exit 0) - if [[ -n $ISTAG && $issame ]] + if [[ ("$ISTAG" != true) && ($isdiff = 0) ]] then echo "Ignored run, documentation is the same as for current master" else |