diff --git a/.github/workflows/gh-release-please.yml b/.github/workflows/gh-release-please.yml index 844b3bd..a5efdc7 100644 --- a/.github/workflows/gh-release-please.yml +++ b/.github/workflows/gh-release-please.yml @@ -15,7 +15,7 @@ jobs: github-releaseplease: runs-on: ubuntu-latest env: - major_and_minor_tags: ${{ inputs.major_and_minor_tags }} + major_and_minor_tags: ${{ inputs.major_and_minor_tags || true }} permissions: contents: write pull-requests: write @@ -26,16 +26,16 @@ jobs: release-type: terraform-module - uses: actions/checkout@v4 - name: tag major and minor versions - if: ${{ steps.release.outputs.release_created == 'true' && env.major_and_minor_tags }} + if: ${{ steps.release.outputs.release_created == 'false' && 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 }}