From a97969533c78b9858f56ffa0a64703f7ee6002b8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Sep 2024 15:45:25 +0000
Subject: [PATCH] chore(deps): bump Kong/public-shared-actions from 2.6.0 to
 2.7.2 (#11598)

Bumps [Kong/public-shared-actions](https://github.com/kong/public-shared-actions) from 2.6.0 to 2.7.2.
- [Release notes](https://github.com/kong/public-shared-actions/releases)
- [Commits](https://github.com/kong/public-shared-actions/compare/ecbcd7051e12e6e3dc37dc890820bbce457bc05f...0aaaa49782e9028086feb943ec04e03e35e3f813)

---
updated-dependencies:
- dependency-name: Kong/public-shared-actions
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/_build_publish.yaml        | 12 ++++++++++++
 .github/workflows/build-test-distribute.yaml |  4 ++++
 2 files changed, 16 insertions(+)

diff --git a/.github/workflows/_build_publish.yaml b/.github/workflows/_build_publish.yaml
index 5b5f709f92e5..46e8426dbdcf 100644
--- a/.github/workflows/_build_publish.yaml
+++ b/.github/workflows/_build_publish.yaml
@@ -128,7 +128,11 @@ jobs:
           make test/container-structure/${{ matrix.image }}
       - name: scan amd64 image
         id: scan_image-amd64
+<<<<<<< HEAD
         uses: Kong/public-shared-actions/security-actions/scan-docker-image@a2132654dffda2a5dd121bbd077a205b4cae8ec0 # v2.4.0
+=======
+        uses: Kong/public-shared-actions/security-actions/scan-docker-image@0aaaa49782e9028086feb943ec04e03e35e3f813 # v2.7.2
+>>>>>>> daa042866 (chore(deps): bump Kong/public-shared-actions from 2.6.0 to 2.7.2 (#11598))
         with:
           asset_prefix: image_${{ matrix.image }}-amd64
           image: ./build/docker/${{ matrix.image }}-amd64.tar
@@ -137,7 +141,11 @@ jobs:
       - name: scan arm64 image
         id: scan_image-arm64
         if: ${{ fromJSON(inputs.FULL_MATRIX) }}
+<<<<<<< HEAD
         uses: Kong/public-shared-actions/security-actions/scan-docker-image@a2132654dffda2a5dd121bbd077a205b4cae8ec0 # v2.4.0
+=======
+        uses: Kong/public-shared-actions/security-actions/scan-docker-image@0aaaa49782e9028086feb943ec04e03e35e3f813 # v2.7.2
+>>>>>>> daa042866 (chore(deps): bump Kong/public-shared-actions from 2.6.0 to 2.7.2 (#11598))
         with:
           asset_prefix: image_${{ matrix.image }}-arm64
           image: ./build/docker/${{ matrix.image }}-arm64.tar
@@ -186,7 +194,11 @@ jobs:
       - name: sign image
         if: ${{ fromJSON(inputs.ALLOW_PUSH) }}
         id: sign
+<<<<<<< HEAD
         uses: Kong/public-shared-actions/security-actions/sign-docker-image@a2132654dffda2a5dd121bbd077a205b4cae8ec0 # v2.4.0
+=======
+        uses: Kong/public-shared-actions/security-actions/sign-docker-image@0aaaa49782e9028086feb943ec04e03e35e3f813 # v2.7.2
+>>>>>>> daa042866 (chore(deps): bump Kong/public-shared-actions from 2.6.0 to 2.7.2 (#11598))
         with:
           image_digest: ${{ steps.image_digest.outputs.digest }}
           tags: ${{ steps.image_meta.outputs.image }}
diff --git a/.github/workflows/build-test-distribute.yaml b/.github/workflows/build-test-distribute.yaml
index d3f53fb5bf48..7e39bc3888b3 100644
--- a/.github/workflows/build-test-distribute.yaml
+++ b/.github/workflows/build-test-distribute.yaml
@@ -70,7 +70,11 @@ jobs:
       - run: |
           make check
       - id: sca-project
+<<<<<<< HEAD
         uses: Kong/public-shared-actions/security-actions/sca@a2132654dffda2a5dd121bbd077a205b4cae8ec0 # v2.4.0
+=======
+        uses: Kong/public-shared-actions/security-actions/sca@0aaaa49782e9028086feb943ec04e03e35e3f813 # v2.7.2
+>>>>>>> daa042866 (chore(deps): bump Kong/public-shared-actions from 2.6.0 to 2.7.2 (#11598))
         with:
           dir: .
           config: .syft.yaml