improve workflow for actual releases

Author: jnnsbrr

.github/workflows/check.yml

@@ -3,7 +3,6 @@ name: check
 on:
   push:
     branches: [main, master]
-    tags: ['v*']
   pull_request:
     branches: [main, master]
 

.github/workflows/release.yml

@@ -2,53 +2,66 @@ name: release
 
 on:
   push:
+    branches: [main, master]
     tags: ['v*']
 
 jobs:
-  check-tag:
+  release:
     runs-on: ubuntu-latest
-    outputs:
-      should-release: ${{ steps.check.outputs.should-release }}
+    permissions:
+      contents: write
+
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
       with:
         fetch-depth: 0  # Fetch all history and tags
         fetch-tags: true  # Ensure all tags are fetched for version resolution
+        token: ${{ secrets.GITHUB_TOKEN }}
 
-    - name: Check if tag is on main/master branch
-      id: check
+    - name: Detect version and tag
+      id: version
       run: |
-        # Get the commit that the tag points to
-        TAG_COMMIT=$(git rev-list -n 1 ${{ github.ref_name }})
-        echo "Tag ${{ github.ref_name }} points to commit: $TAG_COMMIT"
-        
-        # Check if this commit is reachable from main or master
-        if git branch -r --contains $TAG_COMMIT | grep -E "(origin/main|origin/master)" > /dev/null; then
-          echo "✅ Tag ${{ github.ref_name }} is on main/master branch"
-          echo "should-release=true" >> $GITHUB_OUTPUT
+        # Check if this is a tag push
+        if [[ "${{ github.ref }}" == refs/tags/* ]]; then
+          # Direct tag push - use the tag version
+          VERSION=${GITHUB_REF#refs/tags/v}
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+          echo "is_tag_push=true" >> $GITHUB_OUTPUT
+          echo "tag_name=${{ github.ref_name }}" >> $GITHUB_OUTPUT
+          echo "✅ Direct tag push detected: v$VERSION"
         else
-          echo "⚠️  Tag ${{ github.ref_name }} is NOT on main/master branch"
-          echo "Available branches containing this commit:"
-          git branch -r --contains $TAG_COMMIT
-          echo "This release will be skipped for security reasons."
-          echo "To release, merge your changes to main/master first, then tag from there."
-          echo "should-release=false" >> $GITHUB_OUTPUT
+          # Branch push - check if there are new tags
+          echo "🔍 Checking for new tags in this push..."
+          
+          # Get the latest tag
+          LATEST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "")
+          
+          if [ -n "$LATEST_TAG" ]; then
+            # Check if this tag was created in this push
+            if git log --oneline -1 --grep="Version" | grep -q "Version"; then
+              VERSION=${LATEST_TAG#v}
+              echo "version=$VERSION" >> $GITHUB_OUTPUT
+              echo "is_tag_push=false" >> $GITHUB_OUTPUT
+              echo "tag_name=$LATEST_TAG" >> $GITHUB_OUTPUT
+              echo "✅ New tag detected in merge: $LATEST_TAG"
+            else
+              echo "⚠️ No new version tag found in this push"
+              echo "should_release=false" >> $GITHUB_OUTPUT
+              exit 0
+            fi
+          else
+            echo "⚠️ No tags found in repository"
+            echo "should_release=false" >> $GITHUB_OUTPUT
+            exit 0
+          fi
         fi
 
-  release:
-    needs: check-tag
-    if: needs.check-tag.outputs.should-release == 'true'
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
-      with:
-        fetch-depth: 0  # Fetch all history and tags
-        fetch-tags: true  # Ensure all tags are fetched for version resolution
+    - name: Check if release should proceed
+      if: steps.version.outputs.should_release == 'false'
+      run: |
+        echo "Skipping release - no version tag found"
+        exit 0
 
     - name: Set up Python
       uses: actions/setup-python@v5
@@ -91,11 +104,11 @@ jobs:
       run: |
         pip install dist/*.whl
 
-    - name: Extract version
-      id: get_version
+    - name: Display release info
       run: |
-        VERSION=${GITHUB_REF#refs/tags/v}
-        echo "version=$VERSION" >> $GITHUB_OUTPUT
+        echo "🚀 Releasing version: ${{ steps.version.outputs.version }}"
+        echo "📦 Tag name: ${{ steps.version.outputs.tag_name }}"
+        echo "🏷️  Is tag push: ${{ steps.version.outputs.is_tag_push }}"
 
     - name: Publish to PyPI
       env:
@@ -106,8 +119,8 @@ jobs:
     - name: Create Release
       uses: softprops/action-gh-release@v1
       with:
-        tag_name: ${{ github.ref }}
-        name: Release of version ${{ steps.get_version.outputs.version }}
+        tag_name: ${{ steps.version.outputs.tag_name }}
+        name: Release of version ${{ steps.version.outputs.version }}
         body: |
           Changes in this Release
           - Automated release notes