From 1c618bcb9b58e9c9e3daba12df085f84a8045f2c Mon Sep 17 00:00:00 2001
From: Matt Dale <9760375+matthewdale@users.noreply.github.com>
Date: Thu, 23 Oct 2025 16:51:52 -0700
Subject: [PATCH 1/3] Fix the condition to skip golang merge-up steps for dry
 run releses.

---
 golang/pre-publish/action.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/golang/pre-publish/action.yml b/golang/pre-publish/action.yml
index fa7efbe..27ac0b5 100644
--- a/golang/pre-publish/action.yml
+++ b/golang/pre-publish/action.yml
@@ -26,7 +26,7 @@ runs:
         version: v${{ inputs.version }}
         push_tag: ${{ inputs.push_changes }}
     - name: "Determine branch to merge up to"
-      if: ${{ inputs.push_changes }}
+      if: ${{ inputs.push_changes == 'true' }}
       id: get-next-branch
       uses: alcaeus/automatic-merge-up-action/get-next-branch@a43d2c2d3ed5a92a1fce3e3bde21c27c578f50d3 #1.0.0
       with:
@@ -36,7 +36,7 @@ runs:
         fallbackBranch: 'master'
         ignoredBranches: ${{ inputs.ignored_branches }}
     - name: "Manually merge up changes"
-      if: ${{ inputs.push_changes && steps.get-next-branch.outputs.hasNextBranch }}
+      if: ${{ inputs.push_changes == 'true' && steps.get-next-branch.outputs.hasNextBranch }}
       shell: bash
       run: |
         git checkout ${NEXT_BRANCH}

From 1b278122866574db99169028c1f6fc5e60542f5e Mon Sep 17 00:00:00 2001
From: Matt Dale <9760375+matthewdale@users.noreply.github.com>
Date: Tue, 28 Oct 2025 14:54:29 -0700
Subject: [PATCH 2/3] Apply suggestion from @alcaeus

Co-authored-by: Andreas Braun <git@alcaeus.org>
---
 golang/pre-publish/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/golang/pre-publish/action.yml b/golang/pre-publish/action.yml
index 27ac0b5..c278d32 100644
--- a/golang/pre-publish/action.yml
+++ b/golang/pre-publish/action.yml
@@ -26,7 +26,7 @@ runs:
         version: v${{ inputs.version }}
         push_tag: ${{ inputs.push_changes }}
     - name: "Determine branch to merge up to"
-      if: ${{ inputs.push_changes == 'true' }}
+      if: ${{ inputs.push_changes == 'true' && ! contains(fromJSON(inputs.ignored_branches), github.ref_name) }}
       id: get-next-branch
       uses: alcaeus/automatic-merge-up-action/get-next-branch@a43d2c2d3ed5a92a1fce3e3bde21c27c578f50d3 #1.0.0
       with:

From eb1e5ef17eebdbe90a80a08f4539a2b0008393b4 Mon Sep 17 00:00:00 2001
From: Matt Dale <9760375+matthewdale@users.noreply.github.com>
Date: Tue, 28 Oct 2025 14:54:34 -0700
Subject: [PATCH 3/3] Apply suggestion from @alcaeus

Co-authored-by: Andreas Braun <git@alcaeus.org>
---
 golang/pre-publish/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/golang/pre-publish/action.yml b/golang/pre-publish/action.yml
index c278d32..4eea233 100644
--- a/golang/pre-publish/action.yml
+++ b/golang/pre-publish/action.yml
@@ -36,7 +36,7 @@ runs:
         fallbackBranch: 'master'
         ignoredBranches: ${{ inputs.ignored_branches }}
     - name: "Manually merge up changes"
-      if: ${{ inputs.push_changes == 'true' && steps.get-next-branch.outputs.hasNextBranch }}
+      if: ${{ inputs.push_changes == 'true' && ! contains(fromJSON(inputs.ignored_branches), github.ref_name) && steps.get-next-branch.outputs.hasNextBranch }}
       shell: bash
       run: |
         git checkout ${NEXT_BRANCH}