diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 92cbb42..6d73824 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -44,13 +44,6 @@ jobs: # which is useful for controlling the length of the automated changelog fetch-depth: 50 - # Checkout the latest tag to prevent the duplicate run check - - name: Checkout latest tag - run: | - git fetch --tags - latestTag=$(git describe --tags `git rev-list --tags --max-count=1`) - git checkout $latestTag - # once cloned, we just run the GitHub Action for the packager project - name: Package and Release uses: BigWigsMods/packager@v2 diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml index f664c06..3d20eb0 100644 --- a/.github/workflows/tag.yml +++ b/.github/workflows/tag.yml @@ -25,11 +25,12 @@ jobs: with: fetch-depth: '0' - name: Bump version and push tag - uses: anothrNick/github-tag-action@1.36.0 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - WITH_V: true - DEFAULT_BUMP: patch + id: tag_version + uses: mathieudutour/github-tag-action@v6.0 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + create_annotated_tag: true + tag_manual: if: "${{ github.event.inputs.bumpLevel != '' }}" runs-on: ubuntu-latest @@ -38,8 +39,9 @@ jobs: with: fetch-depth: '0' - name: Bump version and push tag - uses: anothrNick/github-tag-action@1.36.0 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - WITH_V: true - DEFAULT_BUMP: ${{ inputs.bumpLevel }} \ No newline at end of file + id: tag_version + uses: mathieudutour/github-tag-action@v6.0 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + create_annotated_tag: true + default_bump: ${{ inputs.bumpLevel }} \ No newline at end of file