diff --git a/action.yml b/action.yml index e50eae0..d086d22 100644 --- a/action.yml +++ b/action.yml @@ -138,7 +138,7 @@ runs: id: digest_old shell: bash run: | - DIGEST=$(docker manifest inspect ${{ steps.vars.outputs.tags }} || echo | jq '.manifests[0].digest') + DIGEST=$((docker manifest inspect ${{ steps.vars.outputs.tags }} || echo )| jq -r '.manifests[0].digest') echo "digest=${DIGEST}" >> $GITHUB_OUTPUT # If a build is required, then checkout, login, build and push! @@ -180,13 +180,12 @@ runs: id: digest_new shell: bash run: | - DIGEST=$(docker manifest inspect ${{ steps.vars.outputs.tags }} | jq '.manifests[0].digest') + DIGEST=$(docker manifest inspect ${{ steps.vars.outputs.tags }} | jq -r '.manifests[0].digest') echo "digest=${DIGEST}" >> $GITHUB_OUTPUT - # Bug - fail if old and new digests match (e.g. no new image was built) - - name: SHA Double-check - if: steps.build.outputs.triggered == 'true' && steps.digest_new.outputs.digest == steps.digest_old.outputs.digest - shell: bash + - shell: bash run: | - echo "SHA collision! New: ${{ steps.digest_new.outputs.digest }}, Old: ${{ steps.digest_old.outputs.digest }}" - exit 1 + # Summary + echo "digest_new: ${{ steps.digest_new.outputs.digest }}" + echo "digest_old: ${{ steps.digest_old.outputs.digest }}" + echo "triggered: ${{ steps.diff.outputs.triggered }}"