Skip to content

Commit e93fb43

Browse files
chore: fix release workflow; revert changelog change (#96)
1 parent 159a4c4 commit e93fb43

File tree

2 files changed

+12
-17
lines changed

2 files changed

+12
-17
lines changed

.github/workflows/release-please.yml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ jobs:
1515
outputs:
1616
release_created: ${{ steps.release.outputs.release_created }}
1717
tag_name: ${{ steps.release.outputs.tag_name }}
18+
major: ${{ steps.release.outputs.major }}
19+
minor: ${{ steps.release.outputs.minor }}
1820
steps:
1921
- id: release
2022
uses: googleapis/release-please-action@a02a34c4d625f9be7cb89156071d8567266a2445 # v4.2.0
@@ -23,7 +25,8 @@ jobs:
2325
manifest-file: .release-please-manifest.json
2426
update-major-minor:
2527
runs-on: ubuntu-latest
26-
if: ${{ steps.release.outputs.release_created }}
28+
needs: [release-please]
29+
if: ${{ needs.release-please.outputs.release_created }}
2730
permissions:
2831
contents: write
2932
steps:
@@ -37,16 +40,16 @@ jobs:
3740
git config user.email 41898282+github-actions[bot]@users.noreply.github.com
3841
3942
# Delete old major and minor tag
40-
git tag -d v${{ steps.release.outputs.major }} || true
41-
git tag -d v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }} || true
42-
git push origin :v${{ steps.release.outputs.major }} || true
43-
git push origin :v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }} || true
43+
git tag -d v${{ needs.release-please.outputs.major }} || true
44+
git tag -d v${{ needs.release-please.outputs.major }}.${{ needs.release-please.outputs.minor }} || true
45+
git push origin :v${{ needs.release-please.outputs.major }} || true
46+
git push origin :v${{ needs.release-please.outputs.major }}.${{ needs.release-please.outputs.minor }} || true
4447
4548
# Create new major and minor tag
46-
git tag -a v${{ steps.release.outputs.major }} -m "Release v${{ steps.release.outputs.major }}"
47-
git tag -a v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }} -m "Release v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}"
48-
git push origin v${{ steps.release.outputs.major }}
49-
git push origin v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}
49+
git tag -a v${{ needs.release-please.outputs.major }} -m "Release v${{ needs.release-please.outputs.major }}"
50+
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 }}"
51+
git push origin v${{ needs.release-please.outputs.major }}
52+
git push origin v${{ needs.release-please.outputs.major }}.${{ needs.release-please.outputs.minor }}
5053
update-readme:
5154
runs-on: ubuntu-latest
5255
if: ${{ needs.release-please.outputs.release_created }}
@@ -72,7 +75,6 @@ jobs:
7275
token: '${{ steps.app-token.outputs.token }}'
7376
fetch-depth: 0
7477
- name: Update readme
75-
if: ${{ steps.release.outputs.release_created }}
7678
run: |
7779
TAG_HASH="$(git rev-parse ${{ needs.release-please.outputs.tag_name }})" TAG="${{ needs.release-please.outputs.tag_name }}" envsubst < ./docs/README.tmpl > ./README.md
7880
git add README.md

CHANGELOG.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
# Changelog
22

3-
## [0.4.1](https://github.com/grafana/github-api-commit-action/compare/v0.4.0...v0.4.1) (2025-04-21)
4-
5-
6-
### 📚 Documentation
7-
8-
* **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))
9-
103
## [0.4.0](https://github.com/grafana/github-api-commit-action/compare/v0.3.1...v0.4.0) (2025-04-21)
114

125

0 commit comments

Comments
 (0)