From 89635bea6e53ce13557d0605d1b8731c64933930 Mon Sep 17 00:00:00 2001
From: Rob B <computerguy440+gh@gmail.com>
Date: Mon, 2 Dec 2024 16:14:22 -0500
Subject: [PATCH 1/2] Include branch and CI run id in container tags to enable
 flux usage

---
 .github/workflows/pull-request.yml | 2 +-
 .github/workflows/push.yml         | 5 ++++-
 cspell.json                        | 2 ++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 7fa54d0c..5b792379 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -53,7 +53,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Build and push Docker image
+      - name: Build Docker image (without pushing)
         uses: docker/build-push-action@v5
         with:
           context: .
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 98a45d92..251f68ee 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -74,6 +74,9 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          flavor: |
+            prefix=-${{ github.ref }}
+            suffix=-${{ github.run_id }}
 
       - name: Build and push Docker image
         uses: docker/build-push-action@v5
@@ -84,7 +87,7 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
 
-      - name: Build and push Docker image
+      - name: Build and push Docker image (development)
         uses: docker/build-push-action@v5
         if: github.ref == 'refs/heads/Dev'
         with:
diff --git a/cspell.json b/cspell.json
index f5416764..dd1f3739 100644
--- a/cspell.json
+++ b/cspell.json
@@ -77,6 +77,7 @@
         "MSVC",
         "Nobelisk",
         "noclip",
+        "noprefix",
         "NSLOCTEXT",
         "nullptr",
         "nullrhi",
@@ -90,6 +91,7 @@
         "redirectors",
         "Robb",
         "RTPC",
+        "sarisia",
         "SCBP",
         "Schem",
         "SCIM",

From ab87272a88af81caf3b8f9c5e4353c60ee999ca6 Mon Sep 17 00:00:00 2001
From: Rob B <computerguy440+gh@gmail.com>
Date: Mon, 2 Dec 2024 16:19:34 -0500
Subject: [PATCH 2/2] Switch to run_id as suffix, no prefix (branch name prefix
 was already present from another system)

---
 .github/workflows/push.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 251f68ee..7e9804f6 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -75,7 +75,6 @@ jobs:
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           flavor: |
-            prefix=-${{ github.ref }}
             suffix=-${{ github.run_id }}
 
       - name: Build and push Docker image