Skip to content

Commit ef2389c

Browse files
authored
fix: brackets and allow sha repeats (#56)
1 parent 48ff07f commit ef2389c

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

action.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ runs:
138138
id: digest_old
139139
shell: bash
140140
run: |
141-
DIGEST=$(docker manifest inspect ${{ steps.vars.outputs.tags }} || echo | jq '.manifests[0].digest')
141+
DIGEST=$((docker manifest inspect ${{ steps.vars.outputs.tags }} || echo )| jq -r '.manifests[0].digest')
142142
echo "digest=${DIGEST}" >> $GITHUB_OUTPUT
143143
144144
# If a build is required, then checkout, login, build and push!
@@ -180,13 +180,12 @@ runs:
180180
id: digest_new
181181
shell: bash
182182
run: |
183-
DIGEST=$(docker manifest inspect ${{ steps.vars.outputs.tags }} | jq '.manifests[0].digest')
183+
DIGEST=$(docker manifest inspect ${{ steps.vars.outputs.tags }} | jq -r '.manifests[0].digest')
184184
echo "digest=${DIGEST}" >> $GITHUB_OUTPUT
185185
186-
# Bug - fail if old and new digests match (e.g. no new image was built)
187-
- name: SHA Double-check
188-
if: steps.build.outputs.triggered == 'true' && steps.digest_new.outputs.digest == steps.digest_old.outputs.digest
189-
shell: bash
186+
- shell: bash
190187
run: |
191-
echo "SHA collision! New: ${{ steps.digest_new.outputs.digest }}, Old: ${{ steps.digest_old.outputs.digest }}"
192-
exit 1
188+
# Summary
189+
echo "digest_new: ${{ steps.digest_new.outputs.digest }}"
190+
echo "digest_old: ${{ steps.digest_old.outputs.digest }}"
191+
echo "triggered: ${{ steps.diff.outputs.triggered }}"

0 commit comments

Comments
 (0)