From 0fab71e85d0aa0a0f101e6a516ef9e8ee490c1b3 Mon Sep 17 00:00:00 2001
From: Michael Nairn <mnairn@redhat.com>
Date: Fri, 2 Feb 2024 18:34:55 +0000
Subject: [PATCH] Add build-images workflow

---
 .github/workflows/build-images.yaml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build-images.yaml b/.github/workflows/build-images.yaml
index 651b6ba1..9df23a4c 100644
--- a/.github/workflows/build-images.yaml
+++ b/.github/workflows/build-images.yaml
@@ -110,24 +110,19 @@ jobs:
     name: Build and Push catalog image
     needs: [build-bundle]
     runs-on: ubuntu-20.04
-    outputs:
-      catalog-image: ${{ steps.catalog-image.outputs.image }}
     steps:
       - name: Check out code
         uses: actions/checkout@v4
 
-      - id: catalog-image
-        run: echo "image=${{ env.IMG_REGISTRY_HOST }}/${{ env.IMG_REGISTRY_ORG }}/${{ env.OPERATOR_NAME }}-catalog:${{ github.sha }}" >> "$GITHUB_OUTPUT"
-
       - name: Run make catalog-build
-        run: make catalog-build BUNDLE_IMG=${{ needs.build-bundle.outputs.bundle-image }} CATALOG_IMG=${{ steps.catalog-image.outputs.image }}
+        run: make catalog-build BUNDLE_IMG=${{ needs.build-bundle.outputs.bundle-image }} CATALOG_IMG=${{ env.IMG_REGISTRY_HOST }}/${{ env.IMG_REGISTRY_ORG }}/${{ env.OPERATOR_NAME }}-catalog:${{ github.sha }}
 
       - name: Push Image
         if: github.repository_owner == 'kuadrant'
         id: push-to-quay
         uses: redhat-actions/push-to-registry@v2
         with:
-          image: ${{ steps.build-image.outputs.image }}
+          image: ${{ env.OPERATOR_NAME }}-catalog
           tags: ${{ steps.build-image.outputs.tags }}
           registry: ${{ env.IMG_REGISTRY_HOST }}/${{ env.IMG_REGISTRY_ORG }}
           username: ${{ secrets.IMG_REGISTRY_USERNAME }}