From acc1df4bb085fb9cf3f716144cb3d22cad0d4446 Mon Sep 17 00:00:00 2001 From: Mike Alfare Date: Tue, 14 May 2024 19:50:44 -0400 Subject: [PATCH] fix branch references --- .github/workflows/release.yml | 2 +- .github/workflows/release_prep_hatch.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 283d81de..54b648ff 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -45,7 +45,7 @@ jobs: outputs: archive-name: ${{ steps.archive.outputs.name }} steps: - - name: "Checkout ${{ github.event.repository.name }}@${{ inputs.branch }}" + - name: "Checkout ${{ github.event.repository.name }}@${{ needs.release-prep.outputs.release-branch }}" uses: actions/checkout@v4 with: ref: ${{ needs.release-prep.outputs.release-branch }} diff --git a/.github/workflows/release_prep_hatch.yml b/.github/workflows/release_prep_hatch.yml index a2742ce7..37129c97 100644 --- a/.github/workflows/release_prep_hatch.yml +++ b/.github/workflows/release_prep_hatch.yml @@ -436,8 +436,8 @@ jobs: # Otherwise, we generated a changelog and/or did the version bump in this workflow and there is a # new sha to use from the merge we just did. Grab that here instead. outputs: - branch: ${{ steps.release-branch.outputs.name }} - sha: ${{ steps.release-sha.outputs.sha }} + branch: ${{ steps.branch.outputs.name }} + sha: ${{ steps.sha.outputs.sha }} steps: - name: "Set release branch" @@ -458,7 +458,7 @@ jobs: ref: ${{ steps.branch.outputs.name }} - name: "Set release SHA" - id: release-sha + id: sha run: echo "sha=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT # if this is a real release and a release branch was created, delete it