From fd06883c41aa7a25258d69060efb5019d2fce4d4 Mon Sep 17 00:00:00 2001
From: Jason N <33561705+JasonN3@users.noreply.github.com>
Date: Tue, 5 Mar 2024 10:44:32 -0500
Subject: [PATCH] remove separate pr name

---
 .github/workflows/build-and-test.yml | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 2514f93..eb51f47 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -29,22 +29,8 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v4
 
-      - name: Docker meta - pull request
-        if: github.event_name == 'pull_request'
-        id: meta_pull
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            ghcr.io/${{ github.repository }}/build-container-installer
-          tags: |
-            type=ref,event=branch
-            type=ref,event=pr
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-
-      - name: Docker meta - pull request
-        if: github.event_name != 'pull_request'
-        id: meta_main
+      - name: Docker meta
+        id: meta
         uses: docker/metadata-action@v5
         with:
           images: |
@@ -60,7 +46,8 @@ jobs:
         uses: redhat-actions/buildah-build@v2
         with:
           containerfiles: Containerfile
-          tags: ${{ steps.meta_pull.outputs.tags || steps.meta_main.outputs.tags }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
           
       - name: Push image
         uses: redhat-actions/push-to-registry@v2