@@ -101,7 +101,7 @@ jobs:
101101 const docker = {
102102 image:{
103103 name:opt.dot.image,
104- arch:(opt.dot.arch || 'linux/amd64,linux/arm64'),
104+ arch:(opt.input?.etc?.arch || opt. dot? .arch || 'linux/amd64,linux/arm64'),
105105 prefix:((opt.input?.etc?.semverprefix) ? `${opt.input?.etc?.semverprefix}-` : ''),
106106 suffix:((opt.input?.etc?.semversuffix) ? `-${opt.input?.etc?.semversuffix}` : ''),
107107 description:(opt.dot?.readme?.description || ''),
@@ -228,7 +228,7 @@ jobs:
228228 with :
229229 driver-opts : network=host
230230
231- - name : docker / build & push & tag grype
231+ - name : docker / build image locally
232232 if : env.WORKFLOW_BUILD == 'true'
233233 id : docker-build
234234 uses : docker/build-push-action@67a2d409c0a876cbe6b11854e3e25193efe4e62d
@@ -257,7 +257,7 @@ jobs:
257257 cache-db : true
258258
259259 - name : grype / fail
260- if : env.WORKFLOW_BUILD == 'true' && (failure() || steps.grype.outcome == 'failure')
260+ if : env.WORKFLOW_BUILD == 'true' && (failure() || steps.grype.outcome == 'failure') && steps.docker-build.outcome == 'success'
261261 uses : anchore/scan-action@dc6246fcaf83ae86fcc6010b9824c30d7320729e
262262 with :
263263 image : ${{ env.DOCKER_CACHE_GRYPE }}
@@ -267,7 +267,7 @@ jobs:
267267 by-cve : true
268268 cache-db : true
269269
270- - name : docker / build & push
270+ - name : docker / build image from cache and push to registries
271271 if : env.WORKFLOW_BUILD == 'true'
272272 uses : docker/build-push-action@67a2d409c0a876cbe6b11854e3e25193efe4e62d
273273 with :
@@ -287,21 +287,8 @@ jobs:
287287
288288
289289 # RELEASE
290- - name : github / release / log
291- continue-on-error : true
292- id : git-log
293- run : |
294- LOCAL_LAST_TAG=$(git describe --abbrev=0 --tags `git rev-list --tags --skip=1 --max-count=1`)
295- echo "using last tag: ${LOCAL_LAST_TAG}"
296- LOCAL_COMMITS=$(git log ${LOCAL_LAST_TAG}..HEAD --oneline)
297-
298- EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
299- echo "commits<<${EOF}" >> ${GITHUB_OUTPUT}
300- echo "${LOCAL_COMMITS}" >> ${GITHUB_OUTPUT}
301- echo "${EOF}" >> ${GITHUB_OUTPUT}
302-
303290 - name : github / release / markdown
304- if : env.WORKFLOW_CREATE_RELEASE == 'true' && steps.git-log.outcome == 'success'
291+ if : env.WORKFLOW_CREATE_RELEASE == 'true'
305292 id : git-release
306293 uses : 11notes/action-docker-release@v1
307294 # WHY IS THIS ACTION NOT SHA256 PINNED? SECURITY MUCH?!?!?!
@@ -310,8 +297,6 @@ jobs:
310297 # in the repo. This code is not modified and can't be modified by this action.
311298 # It does create the markdown for the release, which could be abused, but to what
312299 # extend? Adding a link to a malicious repo?
313- with :
314- git_log : ${{ steps.git-log.outputs.commits }}
315300
316301 - name : github / release / create
317302 if : env.WORKFLOW_CREATE_RELEASE == 'true' && steps.git-release.outcome == 'success'
@@ -419,7 +404,7 @@ jobs:
419404 if [ -f LICENSE ]; then
420405 git add LICENSE
421406 fi
422- git commit -m "github-actions[bot]: update README.md"
407+ git commit -m "update README.md"
423408 git push origin HEAD:master
424409
425410
0 commit comments