From 8d3fb973b1370f41d90f05cab8a52bdff062ca16 Mon Sep 17 00:00:00 2001
From: Michael Edgar <medgar@redhat.com>
Date: Wed, 4 Dec 2024 12:10:15 -0500
Subject: [PATCH] fix: Build UI application and image following Maven release
 process (#1276)

Signed-off-by: Michael Edgar <medgar@redhat.com>
---
 .github/workflows/release.yml | 42 +++++++++++++++++------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 08dde6a93..83bb5d405 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -48,6 +48,27 @@ jobs:
           username: "${{ secrets.IMAGE_REPO_USERNAME }}"
           password: "${{ secrets.IMAGE_REPO_PASSWORD }}"
 
+      # ==================== API & Operator ====================
+      - name: Build and Push API and Operator Image
+        run: |
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git checkout -b release
+          mvn -B release:prepare -DreleaseVersion=${{steps.metadata.outputs.current-version}} -DdevelopmentVersion=${{steps.metadata.outputs.next-version}}
+          git checkout ${{github.base_ref}}
+          git rebase release
+          export QUARKUS_CONTAINER_IMAGE_REGISTRY="${{ secrets.IMAGE_REPO_HOSTNAME }}"
+          export QUARKUS_CONTAINER_IMAGE_GROUP="${{ secrets.IMAGE_REPO_NAMESPACE }}"
+          export QUARKUS_CONTAINER_IMAGE_USERNAME="${{ secrets.IMAGE_REPO_USERNAME }}"
+          export QUARKUS_CONTAINER_IMAGE_PASSWORD="${{ secrets.IMAGE_REPO_PASSWORD }}"
+          export QUARKUS_CONTAINER_IMAGE_PUSH="true"
+          export QUARKUS_CONTAINER_IMAGE_ADDITIONAL_TAGS=latest
+          export QUARKUS_KUBERNETES_NAMESPACE='$${NAMESPACE}'
+          export GIT_REVISION=$(git rev-parse --short release)
+          # Build and push the release images using the commit tagged in `release:prepare`
+          mvn -B -P container-image release:perform --no-transfer-progress \
+            '-Drelease.arguments=-Dquarkus.docker.buildx.platform=${{ env.PLATFORMS }}'
+
       # ==================== UI ====================
       - name: Build UI
         working-directory: target/checkout/ui
@@ -70,27 +91,6 @@ jobs:
             ${{ secrets.IMAGE_REPO_HOSTNAME }}/${{ secrets.IMAGE_REPO_NAMESPACE }}/console-ui:${{steps.metadata.outputs.current-version}}
             ${{ secrets.IMAGE_REPO_HOSTNAME }}/${{ secrets.IMAGE_REPO_NAMESPACE }}/console-ui:latest
 
-      # ==================== API & Operator ====================
-      - name: Build and Push API and Operator Image
-        run: |
-          git config --global user.name "github-actions[bot]"
-          git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
-          git checkout -b release
-          mvn -B release:prepare -DreleaseVersion=${{steps.metadata.outputs.current-version}} -DdevelopmentVersion=${{steps.metadata.outputs.next-version}}
-          git checkout ${{github.base_ref}}
-          git rebase release
-          export QUARKUS_CONTAINER_IMAGE_REGISTRY="${{ secrets.IMAGE_REPO_HOSTNAME }}"
-          export QUARKUS_CONTAINER_IMAGE_GROUP="${{ secrets.IMAGE_REPO_NAMESPACE }}"
-          export QUARKUS_CONTAINER_IMAGE_USERNAME="${{ secrets.IMAGE_REPO_USERNAME }}"
-          export QUARKUS_CONTAINER_IMAGE_PASSWORD="${{ secrets.IMAGE_REPO_PASSWORD }}"
-          export QUARKUS_CONTAINER_IMAGE_PUSH="true"
-          export QUARKUS_CONTAINER_IMAGE_ADDITIONAL_TAGS=latest
-          export QUARKUS_KUBERNETES_NAMESPACE='$${NAMESPACE}'
-          export GIT_REVISION=$(git rev-parse --short release)
-          # Build and push the release images using the commit tagged in `release:prepare`
-          mvn -B -P container-image release:perform --no-transfer-progress \
-            '-Drelease.arguments=-Dquarkus.docker.buildx.platform=${{ env.PLATFORMS }}'
-
       # ==================== Operator-Bundle ====================
       - name: Modify Bundle CSV Metadata
         run: ./operator/bin/modify-bundle-metadata.sh