fix branch references

dbt-labs · May 14, 2024 · acc1df4 · acc1df4
1 parent 3291829
commit acc1df4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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