fix: Fix release drafter config and use drafted notes in release workflow

gnodet · gnodet · commit 9f3aa72a8e96 · 2026-03-18T23:40:53.000+01:00
- Fix master drafter: use $NEXT_PATCH_VERSION instead of hardcoded 4.0.0,
  remove incorrect jline- tag prefix
- Fix 3.x drafter: add jline- prefix to tag template to match actual tags
- Release workflow now publishes existing draft release if available,
  falls back to --generate-notes otherwise
diff --git a/.github/release-drafter-3x.yml b/.github/release-drafter-3x.yml
@@ -17,8 +17,8 @@
 
 # Configuration for Release Drafter for jline-3.x branch
 # This configuration is specifically for the 3.x maintenance branch
-name-template: $NEXT_PATCH_VERSION
-tag-template: $NEXT_PATCH_VERSION
+name-template: JLine $NEXT_PATCH_VERSION
+tag-template: jline-$NEXT_PATCH_VERSION
 version-template: $MAJOR.$MINOR.$PATCH
 commitish: jline-3.x
 
diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
@@ -16,8 +16,8 @@
 # under the License.
 
 # Configuration for Release Drafter: https://github.com/toolmantim/release-drafter
-name-template: 4.0.0
-tag-template: jline-4.0.0
+name-template: JLine $NEXT_PATCH_VERSION
+tag-template: $NEXT_PATCH_VERSION
 version-template: $MAJOR.$MINOR.$PATCH
 commitish: master
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -108,7 +108,17 @@ jobs:
             exit 1
           fi          
           
-          name=$(./mvx mvn -B -q -DforceStdout --raw-streams help:evaluate -N -Dexpression=project.name)
           version=${{ steps.version.outputs.version }}
-          echo "Creating release \"$name $version\" from tag"
-          gh release create $version --verify-tag --notes-from-tag --title "$name $version"
+
+          # Check if release drafter already created a draft release for this version
+          draft_tag=$(gh api repos/${{ github.repository }}/releases \
+            --jq ".[] | select(.draft == true and .tag_name == \"${version}\") | .tag_name" \
+            2>/dev/null || true)
+
+          if [ -n "$draft_tag" ]; then
+            echo "Publishing existing draft release for $version"
+            gh release edit "$version" --draft=false --verify-tag --title "JLine $version"
+          else
+            echo "No draft release found, creating release for $version"
+            gh release create "$version" --verify-tag --generate-notes --title "JLine $version"
+          fi
