From 370ff0ff8a9e14e54e5d467881737359db51656f Mon Sep 17 00:00:00 2001
From: Akseli Lehtniemi <60463103+Akaseli@users.noreply.github.com>
Date: Wed, 12 Aug 2026 09:07:09 +0300
Subject: [PATCH] chore: allow rebuildinging image

---
 .github/workflows/pull_request.yml |  2 ++
 .github/workflows/push_to_main.yml | 32 ++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index ac9d8da..ba4b84d 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -74,8 +74,10 @@ jobs:
         run: docker build --target test -t matrixrmapi:test .
       - name: Build production target
         run: docker build --target production -t matrixrmapi:production .
+
   publish:
     needs: [test, snyk-test, docker-build-and-verify]
+    if: github.event_name == 'pull_request'
     runs-on: arc-runner-set
     permissions:
       contents: read
diff --git a/.github/workflows/push_to_main.yml b/.github/workflows/push_to_main.yml
index 477e7b2..b2c66fe 100644
--- a/.github/workflows/push_to_main.yml
+++ b/.github/workflows/push_to_main.yml
@@ -16,3 +16,35 @@ jobs:
         with:
           snyk-org: deployapp-products
           snyk-token: ${{ secrets.SNYK_TOKEN }}
+
+  # Manual rebuild, release_please.yaml handles releases
+  publish-image:
+    if: github.event_name == 'workflow_dispatch' && github.ref_name == 'main'
+    runs-on: arc-runner-set
+    permissions:
+      contents: read
+      packages: write
+    concurrency:
+      group: publish-image-${{ github.ref }}
+      cancel-in-progress: false
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          submodules: recursive
+          fetch-depth: 0
+      - name: Check out the last released version
+        run: |
+          SEMVER=$(python3 -c "import json; print(json.load(open('.release-please-manifest.json'))['.'])")
+          echo "Rebuilding v${SEMVER}"
+          git checkout "v${SEMVER}"
+      - name: Build and publish Docker image
+        uses: ./.github/actions/publish-image
+        with:
+          product: matrix
+          component: integration
+          dockerhub-username: ${{ vars.DOCKERHUB_USERNAME }}
+          dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          acr-repo: ${{ vars.ACR_REPO }}
+          acr-username: ${{ vars.ACR_USERNAME }}
+          acr-token: ${{ secrets.ACR_TOKEN }}