From 03bc04216b82b7b3f50faaabdface80a1757179e Mon Sep 17 00:00:00 2001
From: Aaron <29749331+aarnphm@users.noreply.github.com>
Date: Thu, 29 Jun 2023 00:14:21 -0400
Subject: [PATCH] fix(ci): fetch correct tags for branch

This reverts commit 47e49186e1d2b2bcca0153db1cd47efecbbbf82b.

Signed-off-by: Aaron <29749331+aarnphm@users.noreply.github.com>
---
 .github/workflows/binary-releases.yml | 6 ++++++
 .github/workflows/release-notes.yml   | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/.github/workflows/binary-releases.yml b/.github/workflows/binary-releases.yml
index 8dea2d89..62dcd133 100644
--- a/.github/workflows/binary-releases.yml
+++ b/.github/workflows/binary-releases.yml
@@ -83,6 +83,8 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
+      - name: Pull latest change
+        run: git pull --autostash --no-edit --gpg-sign --ff origin main
       - name: Fetch PyApp
         run: >-
           mkdir $PYAPP_REPO && curl -L https://github.com/ofek/pyapp/releases/download/v$PYAPP_VERSION/source.tar.gz | tar --strip-components=1 -xzf - -C $PYAPP_REPO
@@ -182,6 +184,8 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
+      - name: Pull latest change
+        run: git pull --autostash --no-edit --gpg-sign --ff origin main
       - name: Install PyOxidizer ${{ env.PYOXIDIZER_VERSION }}
         run: pip install pyoxidizer==${{ env.PYOXIDIZER_VERSION }}
       - name: Download staged binaries
@@ -234,6 +238,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
+      - name: Pull latest change
+        run: git pull --autostash --no-edit --gpg-sign --ff origin main
       - name: Set up Python ${{ env.PYTHON_VERSION }}
         uses: actions/setup-python@v4
         with:
diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml
index 37fb931b..6116e93d 100644
--- a/.github/workflows/release-notes.yml
+++ b/.github/workflows/release-notes.yml
@@ -15,6 +15,11 @@
 name: release-notes
 on:
   workflow_dispatch:
+    inputs:
+      tags:
+        description: 'Tag for releases'
+        required: true
+        type: string
   workflow_call:
     inputs:
       tags:
@@ -68,6 +73,7 @@ jobs:
           generate_release_notes: true
           body_path: release_notes.txt
           fail_on_unmatched_files: true
+          tag_name: 'v${{ inputs.tags }}'
           files: |-
             dist/*
             archives/*