From 5dbde6b9613e67a048d2a6101170a492f735a36d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciek=20Go=C5=82aszewski?= Date: Mon, 19 Aug 2024 09:59:12 +0200 Subject: [PATCH] Update pull_request.yaml after KU-1195 (#14) --- .github/workflows/pull_request.yaml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml index c88e1f4..ed09c1d 100644 --- a/.github/workflows/pull_request.yaml +++ b/.github/workflows/pull_request.yaml @@ -14,10 +14,20 @@ jobs: trivy-image-config: "trivy.yaml" multiarch-awareness: true cache-action: ${{ (github.event_name == 'push') && 'save' || 'restore' }} + scan-images: + uses: canonical/k8s-workflows/.github/workflows/scan_images.yaml@main + needs: [build-and-push-arch-specifics] + secrets: inherit + with: + upload-result: ${{ github.event_name == 'push' }} + images: ${{ needs.build-and-push-arch-specifics.outputs.images }} + trivy-image-config: ./trivy.yaml build-and-push-multiarch-manifest: name: Combine Rocks and Push Multiarch Manifest uses: canonical/k8s-workflows/.github/workflows/assemble_multiarch_image.yaml@main needs: [build-and-push-arch-specifics] + if: ${{ needs.build-and-push-arch-specifics.outputs.changed-rock-metas != '[]' }} with: - rock-metas: ${{ needs.build-and-push-arch-specifics.outputs.rock-metas }} - dry-run: ${{ github.event_name != 'push' }} \ No newline at end of file + rock-metas: ${{ needs.build-and-push-arch-specifics.outputs.changed-rock-metas }} + dry-run: ${{ github.event_name != 'push' }} +