fix yaml and job sequence

netobserv · May 2, 2022 · d2dae4c · d2dae4c
1 parent 14790ff
commit d2dae4c
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -37,8 +37,8 @@ jobs:
         uses: actions/setup-go@v2
         with:
           go-version: ${{ matrix.go }}
-      - name: build image
-        run: VERSION=${{ steps.validate_tag.outputs.tag }} IMAGE_TAG_BASE=${{ env.REGISTRY }}/${{ env.IMAGE }} make image-build bundle-build catalog-build
+      - name: build operator
+        run: VERSION=${{ steps.validate_tag.outputs.tag }} IMAGE_TAG_BASE=${{ env.REGISTRY }}/${{ env.IMAGE }} make image-build
       - name: podman login to quay.io
         uses: redhat-actions/podman-login@v1
         with:
@@ -52,13 +52,17 @@ jobs:
           image: ${{ env.IMAGE }}
           tags: ${{ steps.validate_tag.outputs.tag }}
           registry: ${{ env.REGISTRY }}
+      - name: build bundle
+        run: VERSION=${{ steps.validate_tag.outputs.tag }} IMAGE_TAG_BASE=${{ env.REGISTRY }}/${{ env.IMAGE }} make bundle-build
       - name: push bundle to quay.io
         id: push-bundle
         uses: redhat-actions/push-to-registry@v2
         with:
           image: ${{ env.IMAGE }}-bundle
           tags: v${{ steps.validate_tag.outputs.tag }}
           registry: ${{ env.REGISTRY }}
+      - name: build catalog
+        run: VERSION=${{ steps.validate_tag.outputs.tag }} IMAGE_TAG_BASE=${{ env.REGISTRY }}/${{ env.IMAGE }} make catalog-build
       - name: push catalog to quay.io
         id: push-catalog
         uses: redhat-actions/push-to-registry@v2
@@ -67,4 +71,5 @@ jobs:
           tags: v${{ steps.validate_tag.outputs.tag }}
           registry: ${{ env.REGISTRY }}
       - name: print images reference
-        run: echo "Images: ${{ steps.push-operator.outputs.registry-paths }}, ${{ steps.push-bundle.outputs.registry-paths }}, ${{ steps.push-catalog.outputs.registry-paths }}"
+        run: |
+          echo "Images: ${{ steps.push-operator.outputs.registry-paths }}, ${{ steps.push-bundle.outputs.registry-paths }}, ${{ steps.push-catalog.outputs.registry-paths }}"