From 33ac878e21043b40b5403886bd109d94236a8263 Mon Sep 17 00:00:00 2001
From: Jake Herrmann <jtherrmann@alaska.edu>
Date: Tue, 4 Nov 2025 15:01:33 -0900
Subject: [PATCH 1/3] update test-and-build.yml according to
 reusable-docker-ecr.yml

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

diff --git a/.github/workflows/test-and-build.yml b/.github/workflows/test-and-build.yml
index 1c0597e0..f4c0aac6 100644
--- a/.github/workflows/test-and-build.yml
+++ b/.github/workflows/test-and-build.yml
@@ -76,14 +76,14 @@ jobs:
             org.opencontainers.image.revision=${{ github.sha }}
 
       - name: Add test tag
-        if: github.ref == 'refs/heads/develop'
+        if: ${{ github.event_name != 'pull_request' && contains(inputs.version_tag, '.dev') }}
         uses: akhilerm/tag-push-action@v2.2.0
         with:
           src: ${{ env.HYP3_REGISTRY }}/${{ github.event.repository.name }}:${{ env.SDIST_VERSION }}
           dst: ${{ env.HYP3_REGISTRY }}/${{ github.event.repository.name }}:test
 
       - name: Add latest tag
-        if: github.ref == 'refs/heads/main'
+        if: ${{ github.event_name != 'pull_request' && ! contains(inputs.version_tag, '.dev') }}
         uses: akhilerm/tag-push-action@v2.2.0
         with:
           src: ${{ env.HYP3_REGISTRY }}/${{ github.event.repository.name }}:${{ env.SDIST_VERSION }}

From 2d9200e1afe0bb5aa9f1e85e838a99f4376464c4 Mon Sep 17 00:00:00 2001
From: Jake Herrmann <jtherrmann@alaska.edu>
Date: Tue, 4 Nov 2025 17:02:03 -0900
Subject: [PATCH 2/3] test-and-build concurrency

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

diff --git a/.github/workflows/test-and-build.yml b/.github/workflows/test-and-build.yml
index f4c0aac6..0e4bed7f 100644
--- a/.github/workflows/test-and-build.yml
+++ b/.github/workflows/test-and-build.yml
@@ -1,5 +1,9 @@
 name: Test and build
 
+concurrency:
+  group: ${{ inputs.version_tag }}
+  cancel-in-progress: true
+
 on:
   push:
     branches:

From 62121aaafa72bd78921d85598ec11029492c9968 Mon Sep 17 00:00:00 2001
From: Jake Herrmann <jtherrmann@alaska.edu>
Date: Tue, 4 Nov 2025 17:06:09 -0900
Subject: [PATCH 3/3] fix test-and-build concurrency

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

diff --git a/.github/workflows/test-and-build.yml b/.github/workflows/test-and-build.yml
index 0e4bed7f..ce093f1a 100644
--- a/.github/workflows/test-and-build.yml
+++ b/.github/workflows/test-and-build.yml
@@ -1,9 +1,5 @@
 name: Test and build
 
-concurrency:
-  group: ${{ inputs.version_tag }}
-  cancel-in-progress: true
-
 on:
   push:
     branches:
@@ -37,6 +33,9 @@ jobs:
   dockerize:
     needs: call-version-info-workflow
     runs-on: ubuntu-latest
+    concurrency:
+      group: ${{ needs.call-version-info-workflow.outputs.version_tag }}
+      cancel-in-progress: true
     env:
       SDIST_VERSION: ${{ needs.call-version-info-workflow.outputs.version_tag }}
     steps: