From 8c349ca25a524b24faffc787a1084cdaac88b49c Mon Sep 17 00:00:00 2001
From: Adam Bannach <113929542+abannachGrafana@users.noreply.github.com>
Date: Mon, 21 Apr 2025 15:55:41 -0500
Subject: [PATCH] chore: fix release workflow; revert changelog change

---
 .github/workflows/release-please.yml | 22 ++++++++++++----------
 CHANGELOG.md                         |  7 -------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
index b87f057..67cbea2 100644
--- a/.github/workflows/release-please.yml
+++ b/.github/workflows/release-please.yml
@@ -15,6 +15,8 @@ jobs:
     outputs:
       release_created: ${{ steps.release.outputs.release_created }}
       tag_name: ${{ steps.release.outputs.tag_name }}
+      major: ${{ steps.release.outputs.major }}
+      minor: ${{ steps.release.outputs.minor }}
     steps:
       - id: release
         uses: googleapis/release-please-action@a02a34c4d625f9be7cb89156071d8567266a2445 # v4.2.0
@@ -23,7 +25,8 @@ jobs:
           manifest-file: .release-please-manifest.json
   update-major-minor:
     runs-on: ubuntu-latest
-    if: ${{ steps.release.outputs.release_created }}
+    needs: [release-please]
+    if: ${{ needs.release-please.outputs.release_created }}
     permissions:
       contents: write
     steps:
@@ -37,16 +40,16 @@ jobs:
           git config user.email 41898282+github-actions[bot]@users.noreply.github.com
           
           # Delete old major and minor tag
-          git tag -d v${{ steps.release.outputs.major }} || true
-          git tag -d v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }} || true
-          git push origin :v${{ steps.release.outputs.major }} || true
-          git push origin :v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }} || true
+          git tag -d v${{ needs.release-please.outputs.major }} || true
+          git tag -d v${{ needs.release-please.outputs.major }}.${{ needs.release-please.outputs.minor }} || true
+          git push origin :v${{ needs.release-please.outputs.major }} || true
+          git push origin :v${{ needs.release-please.outputs.major }}.${{ needs.release-please.outputs.minor }} || true
           
           # Create new major and minor tag
-          git tag -a v${{ steps.release.outputs.major }} -m "Release v${{ steps.release.outputs.major }}"
-          git tag -a v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }} -m "Release v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}"
-          git push origin v${{ steps.release.outputs.major }}
-          git push origin v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}
+          git tag -a v${{ needs.release-please.outputs.major }} -m "Release v${{ needs.release-please.outputs.major }}"
+          git tag -a v${{ needs.release-please.outputs.major }}.${{ needs.release-please.outputs.minor }} -m "Release v${{ needs.release-please.outputs.major }}.${{ needs.release-please.outputs.minor }}"
+          git push origin v${{ needs.release-please.outputs.major }}
+          git push origin v${{ needs.release-please.outputs.major }}.${{ needs.release-please.outputs.minor }}
   update-readme:
     runs-on: ubuntu-latest
     if: ${{ needs.release-please.outputs.release_created }}
@@ -72,7 +75,6 @@ jobs:
           token: '${{ steps.app-token.outputs.token }}'
           fetch-depth: 0
       - name: Update readme
-        if: ${{ steps.release.outputs.release_created }}
         run: |
           TAG_HASH="$(git rev-parse ${{ needs.release-please.outputs.tag_name }})" TAG="${{ needs.release-please.outputs.tag_name }}" envsubst < ./docs/README.tmpl > ./README.md
           git add README.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 707488a..9154f08 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +1,5 @@
 # Changelog
 
-## [0.4.1](https://github.com/grafana/github-api-commit-action/compare/v0.4.0...v0.4.1) (2025-04-21)
-
-
-### 📚 Documentation
-
-* **README:** add releases section to README template ([#93](https://github.com/grafana/github-api-commit-action/issues/93)) ([80353e9](https://github.com/grafana/github-api-commit-action/commit/80353e98320a5165a7d134e55868d29c210bf87e))
-
 ## [0.4.0](https://github.com/grafana/github-api-commit-action/compare/v0.3.1...v0.4.0) (2025-04-21)