From 228e7e442f2e1d50127b1544bd5d0a055012563e Mon Sep 17 00:00:00 2001
From: Andrei Matveyeu <andreimu@axis.com>
Date: Mon, 10 Feb 2025 16:57:00 +0100
Subject: [PATCH 1/5] bypass "make docker-push" before merging PRs

Change-Id: I6d46c5a368d9fc00ec891dafac3cbba50752051b
---
 .github/workflows/generate-manifest.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/generate-manifest.yml b/.github/workflows/generate-manifest.yml
index 1d8afc67..1c08e193 100644
--- a/.github/workflows/generate-manifest.yml
+++ b/.github/workflows/generate-manifest.yml
@@ -36,7 +36,11 @@ jobs:
           [ "$VERSION" == "main" ] && VERSION=$(echo ${{ github.sha }} | cut -c1-8)
           echo IMAGE_ID=$IMAGE_ID
           echo VERSION=$VERSION
-          make docker-build docker-push split-installer IMG=$IMAGE_ID:$VERSION
+          if [[ "${{ github.repository_owner }}" == "${{ github.actor }}" && "${{ github.ref }}" == "refs/heads/main" ]]; then
+            make docker-build docker-push split-installer IMG=$IMAGE_ID:$VERSION
+          else
+            make docker-build split-installer IMG=$IMAGE_ID:$VERSION
+          fi
           mkdir -p manifests/controller
           cp dist/* manifests/controller/
       - name: Commit changes

From 059210ae0c61b8b43d306bda6688b70676aafad7 Mon Sep 17 00:00:00 2001
From: Andrei Matveyeu <andreimu@axis.com>
Date: Wed, 19 Feb 2025 13:23:49 +0100
Subject: [PATCH 2/5] Revert "bypass "make docker-push" before merging PRs"

This reverts commit 228e7e442f2e1d50127b1544bd5d0a055012563e.
---
 .github/workflows/generate-manifest.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/workflows/generate-manifest.yml b/.github/workflows/generate-manifest.yml
index 1c08e193..1d8afc67 100644
--- a/.github/workflows/generate-manifest.yml
+++ b/.github/workflows/generate-manifest.yml
@@ -36,11 +36,7 @@ jobs:
           [ "$VERSION" == "main" ] && VERSION=$(echo ${{ github.sha }} | cut -c1-8)
           echo IMAGE_ID=$IMAGE_ID
           echo VERSION=$VERSION
-          if [[ "${{ github.repository_owner }}" == "${{ github.actor }}" && "${{ github.ref }}" == "refs/heads/main" ]]; then
-            make docker-build docker-push split-installer IMG=$IMAGE_ID:$VERSION
-          else
-            make docker-build split-installer IMG=$IMAGE_ID:$VERSION
-          fi
+          make docker-build docker-push split-installer IMG=$IMAGE_ID:$VERSION
           mkdir -p manifests/controller
           cp dist/* manifests/controller/
       - name: Commit changes

From 19f8d678bc9ede989a27b23c23ca7c53fa3a1a9f Mon Sep 17 00:00:00 2001
From: Andrei Matveyeu <andreimu@axis.com>
Date: Wed, 19 Feb 2025 13:34:01 +0100
Subject: [PATCH 3/5] run `make docker-push` in a separate step after merge

Change-Id: Iad5866932b19b59e16e060d44e7777a8b3421192
---
 .github/workflows/generate-manifest.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/generate-manifest.yml b/.github/workflows/generate-manifest.yml
index 1d8afc67..91266386 100644
--- a/.github/workflows/generate-manifest.yml
+++ b/.github/workflows/generate-manifest.yml
@@ -36,9 +36,15 @@ jobs:
           [ "$VERSION" == "main" ] && VERSION=$(echo ${{ github.sha }} | cut -c1-8)
           echo IMAGE_ID=$IMAGE_ID
           echo VERSION=$VERSION
+          echo "IMAGE_ID=$IMAGE_ID" >> $GITHUB_ENV
+          echo "VERSION=$VERSION" >> $GITHUB_ENV
           make docker-build docker-push split-installer IMG=$IMAGE_ID:$VERSION
           mkdir -p manifests/controller
           cp dist/* manifests/controller/
+      - name: Push docker image
+        if: github.event.pull_request.merged == true
+        run: |
+          make docker-push IMG=$IMAGE_ID:$VERSION
       - name: Commit changes
         run: |
           git config --global user.name 'github-actions[bot]'

From f97f918d02e4af8c25f2781354d01418eb70b868 Mon Sep 17 00:00:00 2001
From: Andrei Matveyeu <andreimu@axis.com>
Date: Wed, 19 Feb 2025 13:35:46 +0100
Subject: [PATCH 4/5] minor fix

Change-Id: I083b0c4aa3a7cfc4d06017dd89c783880650766c
---
 .github/workflows/generate-manifest.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/generate-manifest.yml b/.github/workflows/generate-manifest.yml
index 91266386..ae88e539 100644
--- a/.github/workflows/generate-manifest.yml
+++ b/.github/workflows/generate-manifest.yml
@@ -38,7 +38,7 @@ jobs:
           echo VERSION=$VERSION
           echo "IMAGE_ID=$IMAGE_ID" >> $GITHUB_ENV
           echo "VERSION=$VERSION" >> $GITHUB_ENV
-          make docker-build docker-push split-installer IMG=$IMAGE_ID:$VERSION
+          make docker-build split-installer IMG=$IMAGE_ID:$VERSION
           mkdir -p manifests/controller
           cp dist/* manifests/controller/
       - name: Push docker image

From 6fe348079ee8c2753007d7551e3c8c092c371f44 Mon Sep 17 00:00:00 2001
From: Andrei Matveyeu <andreimu@axis.com>
Date: Wed, 19 Feb 2025 13:41:31 +0100
Subject: [PATCH 5/5] Update in 'commit changes' step

Change-Id: I5756c477aea7bc4a13a53b4f344e4b7b84f446c0
---
 .github/workflows/generate-manifest.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/generate-manifest.yml b/.github/workflows/generate-manifest.yml
index ae88e539..cb3cf2b2 100644
--- a/.github/workflows/generate-manifest.yml
+++ b/.github/workflows/generate-manifest.yml
@@ -46,6 +46,7 @@ jobs:
         run: |
           make docker-push IMG=$IMAGE_ID:$VERSION
       - name: Commit changes
+        if: github.event.pull_request.merged == true
         run: |
           git config --global user.name 'github-actions[bot]'
           git config --global user.email 'github-actions[bot]@users.noreply.github.com'