From ebf2cb971a476f9d940dfb6d9a27cd09985923c3 Mon Sep 17 00:00:00 2001 From: Gabriel Stackhouse Date: Fri, 12 Apr 2024 13:25:28 -0500 Subject: [PATCH 1/4] Add a working automated release action to the main workflow --- .github/workflows/main.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 37403c22..bccd27c4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,14 +30,15 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GIT_API_TAGGING: false # uses git cli - # auto releases is not working atm and is deleting releases due branch tags - - name: automatic-draft-release - uses: marvinpinto/action-automatic-releases@v1.2.1 + - name: automatic-release + uses: softprops/action-gh-release@v2.0.0 with: - draft: true - repo_token: ${{ secrets.GITHUB_TOKEN }} - title: "${{ steps.tag.outputs.tag }}: [title-edit-me] by:${{ github.actor }}" - automatic_release_tag: ${{ steps.tag.outputs.new_tag }} +# draft: true # Can uncomment this if you want to keep it a draft, but I find it more useful to auto-publish the release on each PR merge. + token: ${{ secrets.GITHUB_TOKEN }} +# name: "${{ steps.tag.outputs.tag }}: [title-edit-me] by:${{ github.actor }}" # Uncomment if you go the draft route, otherwise it defaults to the tag name (i.e. 1.67.0) + tag_name: ${{ steps.tag_version.outputs.new_tag }} + generate_release_notes: true + prerelease: false - name: version-tag-major env: From c092e525bb39a28994489883333966763dda84d2 Mon Sep 17 00:00:00 2001 From: Gabriel Stackhouse Date: Fri, 12 Apr 2024 13:30:55 -0500 Subject: [PATCH 2/4] Use the correct ID --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bccd27c4..81a859dd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -36,7 +36,7 @@ jobs: # draft: true # Can uncomment this if you want to keep it a draft, but I find it more useful to auto-publish the release on each PR merge. token: ${{ secrets.GITHUB_TOKEN }} # name: "${{ steps.tag.outputs.tag }}: [title-edit-me] by:${{ github.actor }}" # Uncomment if you go the draft route, otherwise it defaults to the tag name (i.e. 1.67.0) - tag_name: ${{ steps.tag_version.outputs.new_tag }} + tag_name: ${{ steps.tag.outputs.new_tag }} generate_release_notes: true prerelease: false From cf38bfd6e905aa5bea1ad3c510f6840258426a23 Mon Sep 17 00:00:00 2001 From: Gabriel Stackhouse Date: Thu, 27 Jun 2024 15:37:36 -0500 Subject: [PATCH 3/4] Remove commented-out lines in the release workflow --- .github/workflows/main.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 81a859dd..474fdf81 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,9 +33,7 @@ jobs: - name: automatic-release uses: softprops/action-gh-release@v2.0.0 with: -# draft: true # Can uncomment this if you want to keep it a draft, but I find it more useful to auto-publish the release on each PR merge. token: ${{ secrets.GITHUB_TOKEN }} -# name: "${{ steps.tag.outputs.tag }}: [title-edit-me] by:${{ github.actor }}" # Uncomment if you go the draft route, otherwise it defaults to the tag name (i.e. 1.67.0) tag_name: ${{ steps.tag.outputs.new_tag }} generate_release_notes: true prerelease: false From 5a9c83298af89bd4bb0cabb785030585b8f25822 Mon Sep 17 00:00:00 2001 From: Gabriel Stackhouse Date: Thu, 27 Jun 2024 15:39:46 -0500 Subject: [PATCH 4/4] Simple comment tweak to trigger the workflow on merge --- entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index 9f43f89a..c31e2a33 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -104,7 +104,7 @@ matching_pre_tag_refs=$( (grep -E "$preTagFmt" <<< "$git_refs") || true) tag=$(head -n 1 <<< "$matching_tag_refs") pre_tag=$(head -n 1 <<< "$matching_pre_tag_refs") -# if there are none, start tags at INITIAL_VERSION +# if there are none, start tags at initial version if [ -z "$tag" ] then if $with_v