From 5d09d08c5665b099314932d915bb6891e5269677 Mon Sep 17 00:00:00 2001
From: Anahide Tchertchian <608958+atchertchian@users.noreply.github.com>
Date: Mon, 13 Nov 2023 16:44:58 +0100
Subject: [PATCH 1/2] AAE-18009: skip grype scanning when grype-scan-enabled
 input is false

---
 .github/actions/docker-build-image/action.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/actions/docker-build-image/action.yml b/.github/actions/docker-build-image/action.yml
index 746b40755..9a1deddc3 100644
--- a/.github/actions/docker-build-image/action.yml
+++ b/.github/actions/docker-build-image/action.yml
@@ -128,6 +128,7 @@ runs:
         provenance: false
 
     - name: Anchore Scan API Image
+      if: inputs.grype-scan-enabled == 'true'
       uses: anchore/scan-action@24fd7c9060f3c96848dd1929fac8d796fb5ae4b4 # v3.3.6
       id: scan
       with:
@@ -138,11 +139,12 @@ runs:
         severity-cutoff: critical
 
     - name: Echo sarif
+      if: inputs.grype-scan-enabled == 'true'
       shell: bash
       run: echo "$(<results.sarif )"
 
     - name: Upload SARIF Files
-      if: ${{ always() && inputs.grype-scan-enabled == 'true' }}
+      if: always() && inputs.grype-scan-enabled == 'true'
       uses: github/codeql-action/upload-sarif@49abf0ba24d0b7953cb586944e918a0b92074c80 # v2.22.4
       continue-on-error: true # do not fail if GHAS is not enabled
       with:

From 3468331002dd8a407576e522908b75f9af3ad432 Mon Sep 17 00:00:00 2001
From: Anahide Tchertchian <608958+atchertchian@users.noreply.github.com>
Date: Mon, 13 Nov 2023 16:47:05 +0100
Subject: [PATCH 2/2] bump patch version

---
 version.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.txt b/version.txt
index 130165bc0..c7c6e8009 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-v3.6.0
+v3.6.1