diff --git a/.github/workflows/gh-release-please.yml b/.github/workflows/gh-release-please.yml index 510c199..c408804 100644 --- a/.github/workflows/gh-release-please.yml +++ b/.github/workflows/gh-release-please.yml @@ -18,13 +18,16 @@ on: type: string default: .release-please-manifest.json outputs: - release_created: + release_created: description: "Whether a release was created" value: ${{ jobs.github-releaseplease.outputs.release_created }} + release_number: + description: "The release number" + value: ${{ jobs.github-releaseplease.outputs.release_number }} push: branches: - - 'main' - + - "main" + jobs: github-releaseplease: runs-on: ubuntu-latest @@ -33,6 +36,7 @@ jobs: pull-requests: write outputs: release_created: ${{ steps.release.outputs.releases_created }} + release_number: ${{ steps.release.outputs.version }} env: major_and_minor_tags: ${{ inputs.major_and_minor_tags || true }} steps: @@ -46,14 +50,14 @@ jobs: - name: tag major and minor versions if: ${{ steps.release.outputs.releases_created == 'true' && env.major_and_minor_tags == 'true' }} run: | - git config user.name github-actions[bot] - git config user.email 41898282+github-actions[bot]@users.noreply.github.com - git remote add gh-token "https://${{ secrets.GITHUB_TOKEN }}@github.com/googleapis/release-please-action.git" - 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 -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 config user.name github-actions[bot] + git config user.email 41898282+github-actions[bot]@users.noreply.github.com + git remote add gh-token "https://${{ secrets.GITHUB_TOKEN }}@github.com/googleapis/release-please-action.git" + 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 -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 }}