From 324f92fd1a8158cf82320511a54ef3b5435c5e87 Mon Sep 17 00:00:00 2001
From: Jason N <33561705+JasonN3@users.noreply.github.com>
Date: Tue, 5 Mar 2024 10:28:35 -0500
Subject: [PATCH] Update build-and-test.yml

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

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 79ed162..2514f93 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -29,8 +29,22 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v4
 
-      - name: Docker meta
-        id: meta
+      - 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
         uses: docker/metadata-action@v5
         with:
           images: |
@@ -46,7 +60,7 @@ jobs:
         uses: redhat-actions/buildah-build@v2
         with:
           containerfiles: Containerfile
-          tags: ${{ steps.meta.outputs.tags }}
+          tags: ${{ steps.meta_pull.outputs.tags || steps.meta_main.outputs.tags }}
           
       - name: Push image
         uses: redhat-actions/push-to-registry@v2