From ee255eec364f9531630dc731c087a27264d4a797 Mon Sep 17 00:00:00 2001
From: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Date: Mon, 15 Apr 2024 13:37:07 -0500
Subject: [PATCH] Improve release workflow (#4405)

---
 .github/workflows/release-files.yml | 5 +++--
 .github/workflows/tarball.yml       | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release-files.yml b/.github/workflows/release-files.yml
index 3d90efee6e1..aba0e9efd00 100644
--- a/.github/workflows/release-files.yml
+++ b/.github/workflows/release-files.yml
@@ -43,15 +43,16 @@ jobs:
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           fetch-depth: 0
+          ref: '${{ github.head_ref || github.ref_name }}'
 
       - uses: rickstaa/action-create-tag@a1c7777fcb2fee4f19b0f283ba888afa11678b72 # v1.7.2
         id: "tag_create"
         with:
           commit_sha: ${{ inputs.file_sha }}
           tag: "${{ inputs.use_tag }}"
-          force_push_tag: true
+          force_push_tag: false
+          tag_exists_error: false
           message: "Latest snapshot-1.14"
-        if: ${{ inputs.use_environ == 'snapshots' }}
 
       # Print result using the action output.
       - run: |
diff --git a/.github/workflows/tarball.yml b/.github/workflows/tarball.yml
index 1f298dff61b..8286f9860cc 100644
--- a/.github/workflows/tarball.yml
+++ b/.github/workflows/tarball.yml
@@ -90,6 +90,7 @@ jobs:
         uses: actions/checkout@v4.1.1
         with:
           path: hdfsrc
+          ref: '${{needs.check_commits.outputs.branch_ref }}'
 
       - name: Install Autotools Dependencies (Linux, serial)
         run: |