Skip to content

Commit cf3dfa7

Browse files
[#patch](deps): Bump the actions-deps group with 2 updates (#296)
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edoardo Rosa <6991986+notdodo@users.noreply.github.com>
1 parent e8754a0 commit cf3dfa7

3 files changed

Lines changed: 19 additions & 15 deletions

File tree

.github/workflows/clean-branch-cache.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ jobs:
3232
## Setting this to not fail the workflow while deleting cache keys.
3333
set +e
3434
echo "Deleting caches..."
35-
for cacheKey in $cacheKeysForPR
36-
do
35+
while IFS= read -r cacheKey; do
36+
[ -z "$cacheKey" ] && continue
3737
gh cache delete "$cacheKey"
38-
done
38+
done <<< "$cacheKeysForPR"
3939
echo "Done"
4040
env:
4141
GH_TOKEN: ${{ github.token }}

.github/workflows/docker-build-and-push.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ jobs:
140140
- name: Build and push
141141
id: build
142142
if: inputs.push
143-
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
143+
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
144144
with:
145145
annotations: ${{ steps.metadata.outputs.annotations }}
146146
cache-from: type=gha
@@ -155,7 +155,7 @@ jobs:
155155
- name: Build push locally
156156
id: build-local
157157
if: ${{ !inputs.push }}
158-
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
158+
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
159159
with:
160160
cache-from: type=gha
161161
cache-to: type=gha,mode=max
@@ -173,10 +173,12 @@ jobs:
173173
IMAGE_REF: ${{ inputs.push && format('{0}/{1}@{2}', inputs.registry, inputs.image, steps.build.outputs.digest) || '' }}
174174
LOCAL_IMAGE_REF: ${{ !inputs.push && format('localimage:{0}', github.sha) || '' }}
175175
run: |
176-
echo "image_name=${IMAGE_NAME}" >> "${GITHUB_OUTPUT}"
177-
echo "image_digest=${IMAGE_DIGEST}" >> "${GITHUB_OUTPUT}"
178-
echo "image_ref=${IMAGE_REF}" >> "${GITHUB_OUTPUT}"
179-
echo "local_image_ref=${LOCAL_IMAGE_REF}" >> "${GITHUB_OUTPUT}"
176+
{
177+
echo "image_name=${IMAGE_NAME}"
178+
echo "image_digest=${IMAGE_DIGEST}"
179+
echo "image_ref=${IMAGE_REF}"
180+
echo "local_image_ref=${LOCAL_IMAGE_REF}"
181+
} >> "${GITHUB_OUTPUT}"
180182
- name: Generate artifact attestation
181183
if: inputs.push
182184
uses: actions/attest-build-provenance@96278af6caaf10aea03fd8d33a09a777ca52d62f # v3.2.0
@@ -186,7 +188,7 @@ jobs:
186188
push-to-registry: true
187189
create-storage-record: ${{ startsWith(inputs.registry, 'ghcr.io') }}
188190
- name: Run Trivy Scan
189-
uses: aquasecurity/trivy-action@b6643a29fecd7f34b3597bc6acb0a98b03d33ff8 # v0.33.1
191+
uses: aquasecurity/trivy-action@c1824fd6edce30d7ab345a9989de00bbd46ef284 # v0.34.0
190192
if: inputs.scan-image
191193
with:
192194
format: sarif
@@ -197,7 +199,7 @@ jobs:
197199
output: ${{ inputs.working-directory }}/trivy_results.sarif
198200
github-pat: ${{ secrets.GITHUB_TOKEN }}
199201
- name: Generate SBOM
200-
uses: aquasecurity/trivy-action@b6643a29fecd7f34b3597bc6acb0a98b03d33ff8 # v0.33.1
202+
uses: aquasecurity/trivy-action@c1824fd6edce30d7ab345a9989de00bbd46ef284 # v0.34.0
201203
if: inputs.push
202204
with:
203205
format: spdx-json

.github/workflows/terraform-ci.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
filter_mode: nofilter
102102

103103
- name: Run Trivy Scan
104-
uses: aquasecurity/trivy-action@b6643a29fecd7f34b3597bc6acb0a98b03d33ff8 # v0.33.1
104+
uses: aquasecurity/trivy-action@c1824fd6edce30d7ab345a9989de00bbd46ef284 # v0.34.0
105105
with:
106106
hide-progress: true
107107
format: sarif
@@ -175,9 +175,11 @@ jobs:
175175
id: plan
176176
run: |
177177
terraform plan -no-color -input=false | tee plan.txt
178-
echo "plan<<EOF" >> $GITHUB_OUTPUT
179-
cat plan.txt >> $GITHUB_OUTPUT
180-
echo "EOF" >> $GITHUB_OUTPUT
178+
{
179+
echo "plan<<EOF"
180+
cat plan.txt
181+
echo "EOF"
182+
} >> "$GITHUB_OUTPUT"
181183
continue-on-error: true
182184
- uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
183185
if: github.event_name == 'pull_request'

0 commit comments

Comments
 (0)