From 829e5858a093076aacc854777e8d026bba1f57dc Mon Sep 17 00:00:00 2001 From: Qingyang Hu Date: Wed, 28 Jan 2026 11:25:19 -0500 Subject: [PATCH 1/2] GODRIVER-3797 Skip manual merge on dry run. --- 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 4eea233..7efd337 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' && ! contains(fromJSON(inputs.ignored_branches), github.ref_name) && steps.get-next-branch.outputs.hasNextBranch }} + if: ${{ inputs.dry_run == 'false' && 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} From cde91223f38608bd16578a8f2e8a84be306f1409 Mon Sep 17 00:00:00 2001 From: Qingyang Hu Date: Wed, 28 Jan 2026 11:34:08 -0500 Subject: [PATCH 2/2] add dry_run --- golang/pre-publish/action.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/golang/pre-publish/action.yml b/golang/pre-publish/action.yml index 7efd337..4f8506c 100644 --- a/golang/pre-publish/action.yml +++ b/golang/pre-publish/action.yml @@ -10,6 +10,9 @@ inputs: ignored_branches: description: Branches to ignore when merging up changes required: true + dry_run: + description: Whether this is a dry run + required: true runs: using: composite