diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c0f9d1b..801bdb1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -52,14 +52,16 @@ jobs: # Release notes for this version only (passed to goreleaser) git-cliff --tag ${{ github.event.inputs.version }} --latest --strip header -o RELEASE_NOTES.md - - name: Tag and push release + - name: Commit changelog and tag release run: | VERSION="${{ github.event.inputs.version }}" git config user.name "github-actions[bot]" git config user.email "github-actions[bot]@users.noreply.github.com" git remote set-url origin https://x-access-token:${{ secrets.RELEASE_TOKEN }}@github.com/${{ github.repository }} + git add CHANGELOG.md RELEASE_NOTES.md + git commit -m "chore(release): update changelog for ${VERSION}" git tag "${VERSION}" - git push origin --tags + git push origin main --tags - name: Install cosign uses: sigstore/cosign-installer@v3 @@ -149,18 +151,5 @@ jobs: "dist/verda_${VER}_SHA256SUMS.sig" \ "dist/verda_${VER}_SHA256SUMS.pem" - - name: Commit changelog and create PR - env: - GH_TOKEN: ${{ secrets.RELEASE_TOKEN }} - run: | - VERSION="${{ github.event.inputs.version }}" - BRANCH="chore/changelog-${VERSION}" - git checkout -b "${BRANCH}" - git add CHANGELOG.md - git commit -m "chore(release): update changelog for ${VERSION}" - git push origin "${BRANCH}" - gh pr create \ - --base main \ - --head "${BRANCH}" \ - --title "chore(release): update changelog for ${VERSION}" \ - --body "Updates CHANGELOG.md with release notes for ${VERSION}." + - name: Clean up release notes + run: rm -f RELEASE_NOTES.md