Attempt to fix up release note generation and automatic milestone clo…

…sing/creation in GitHub Actions
Hammerspoon · Mar 12, 2023 · 2a95918 · 2a95918
1 parent 3ca0cb9
commit 2a95918
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/.github/workflows/new_tag.yml b/.github/workflows/new_tag.yml
@@ -20,7 +20,7 @@ jobs:
         run: echo "TAGNAME=$(git describe --abbrev=0)" >> $GITHUB_OUTPUT
       - name: Get previous tag name
         id: previous_tag
-        run: echo "TAGNAME=$(git describe --abbrev=0 --tags $(git rev-list --tags --skip=1 --max-count=1))" >> $GITHUB_OUTPUT
+        run: echo "TAGNAME=$(git describe --abbrev=0 ${{ steps.current_tag.outputs.TAGNAME}}^)" >> $GITHUB_OUTPUT
       - name: Get date
         id: date
         run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
@@ -52,6 +52,7 @@ jobs:
   create-next-milestone:
     name: Create next milestone
     runs-on: ubuntu-latest
+    needs: generate-release-notes
     steps:
       - uses: actions/checkout@v2
         with:
@@ -66,7 +67,7 @@ jobs:
 
       - name: Get previous tag name
         id: previous_tag
-        run: echo "TAGNAME=$(git describe --abbrev=0 HEAD^)" >> $GITHUB_OUTPUT
+        run: echo "TAGNAME=$(git describe --abbrev=0 ${{ steps.current_tag.outputs.TAGNAME}}^)" >> $GITHUB_OUTPUT
 
       - name: Get next version
         id: next_tag
@@ -76,9 +77,9 @@ jobs:
 
       - name: Display calculated versions
         run: |
+          echo "Previous version: ${{ steps.previous_tag.outputs.TAGNAME }}"
           echo "Current version: ${{ steps.current_tag.outputs.TAGNAME }}"
-          echo "Previous version: ${{ steps.previous_tag.outputs.TAGNAME  }}"
-          echo "Next version: ${{ steps.next_tag.outputs.patch  }}"
+          echo "Next version: ${{ steps.next_tag.outputs.patch }}"
 
       - name: Create milestone
         uses: "WyriHaximus/github-action-create-milestone@v1"
@@ -91,7 +92,7 @@ jobs:
         uses: "Beakyn/gha-close-milestone@v1.1.1"
         with:
           repository: ${{ github.repository }}
-          milestone-title: ${{ steps.previous_tag.outputs.TAGNAME }}
+          milestone-title: ${{ steps.current_tag.outputs.TAGNAME }}
         env:
           GITHUB_TOKEN: "${{ github.token }}"