Chores: Improve release flow by combining tagging and releasing

Author: JannikSt

.github/workflows/release.yml

@@ -1,81 +1,120 @@
-name: Release
-
+name: Tag and Release
 on:
   push:
-    tags:
-      - 'v*.*.*'
-  create:
-    tags:
-      - 'v*.*.*'
+    branches:
+      - main
   workflow_dispatch:
     inputs:
       tag:
         description: 'Tag to create release from (e.g. v1.2.3)'
-        required: true
+        required: false
         type: string
 
 jobs:
-  debug:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Debug trigger
-        run: |
-          echo "Event name: ${{ github.event_name }}"
-          echo "Ref: ${{ github.ref }}"
-          echo "Tag: ${{ github.ref_name }}"
-          echo "Manual tag: ${{ inputs.tag }}"
-
-  release:
+  tag-and-release:
     runs-on: ubuntu-latest
-    needs: debug
     permissions:
-      contents: write 
+      contents: write
     steps:
       - uses: actions/checkout@v3
         with:
-          fetch-depth: 0  # Need full history for changelog
-      
-      - name: Set up Python
-        uses: actions/setup-python@v3
-        with:
-          python-version: '3.8'
-          
-      - name: Get version changelog
-        id: changelog
+          fetch-depth: 0
+
+      # Get version from pyproject.toml on push
+      - name: Get version from pyproject.toml
+        if: github.event_name == 'push'
+        id: auto_version
+        run: |
+          VERSION=$(grep '^version = ' pyproject.toml | cut -d'"' -f2)
+          echo "VERSION=$VERSION"
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+
+      # Get version from manual input
+      - name: Get version from input
+        if: github.event_name == 'workflow_dispatch' && inputs.tag != ''
+        id: manual_version
         run: |
-          # Use manual tag input if workflow_dispatch, otherwise use git tag
-          if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
-            VERSION="${{ github.event.inputs.tag }}"
-            VERSION=${VERSION#v}  # Remove v prefix if present
+          VERSION=${{ inputs.tag }}
+          VERSION=${VERSION#v}
+          echo "VERSION=$VERSION"
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+
+      # Combine versions and verify
+      - name: Set final version
+        id: version
+        run: |
+          VERSION="${{ steps.auto_version.outputs.version || steps.manual_version.outputs.version }}"
+          if [ -z "$VERSION" ]; then
+            echo "Error: No version found"
+            exit 1
+          fi
+          echo "VERSION=$VERSION"
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+
+      # Check if tag exists
+      - name: Check for existing tag
+        id: check_tag
+        run: |
+          if git tag -l "v${{ steps.version.outputs.version }}" | grep -q .; then
+            echo "exists=true" >> $GITHUB_OUTPUT
+            echo "Tag v${{ steps.version.outputs.version }} already exists. Skipping release."
+            exit 0
           else
-            VERSION=${GITHUB_REF#refs/tags/v}
+            echo "exists=false" >> $GITHUB_OUTPUT
           fi
-          # Extract the section for this version from CHANGELOG.md
-          sed -n "/## \\\[$VERSION\\\]/,/## \\\[/p" @CHANGELOG.md | sed '$d' > release_notes.md
-          # Debug output
-          echo "Tag version: $VERSION"
-          echo "CHANGELOG.md contents:"
-          cat CHANGELOG.md
-          echo "Generated release notes:"
-          cat release_notes.md
-          
-      - name: Install dependencies
+
+      # Create new tag if it doesn't exist
+      - name: Create tag
+        if: steps.check_tag.outputs.exists != 'true'
+        run: |
+          git config --global user.name 'github-actions[bot]'
+          git config --global user.email 'github-actions[bot]@users.noreply.github.com'
+          git tag -a "v${{ steps.version.outputs.version }}" -m "Release v${{ steps.version.outputs.version }}"
+          git push origin "v${{ steps.version.outputs.version }}"
+
+      # Setup Python for build
+      - name: Set up Python
+        if: steps.check_tag.outputs.exists != 'true'
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.8'
+
+      # Install build tools
+      - name: Install build tools
+        if: steps.check_tag.outputs.exists != 'true'
         run: |
           python -m pip install --upgrade pip
-          pip install build twine hatchling
-          
+          pip install build twine
+
+      # Build package
       - name: Build package
+        if: steps.check_tag.outputs.exists != 'true'
         run: python -m build
-        
+
+      # Get release notes
+      - name: Get release notes
+        if: steps.check_tag.outputs.exists != 'true'
+        run: |
+          VERSION=${{ steps.version.outputs.version }}
+          echo "# Release v$VERSION" > release_notes.md
+          if [ -f CHANGELOG.md ]; then
+            echo "" >> release_notes.md
+            sed -n "/## \[${VERSION}\]/,/## \[/p" CHANGELOG.md | sed '$d' >> release_notes.md || true
+          fi
+
+      # Create GitHub Release
       - name: Create GitHub Release
+        if: steps.check_tag.outputs.exists != 'true'
         uses: softprops/action-gh-release@v1
         with:
-          tag_name: ${{ github.event.inputs.tag }}
+          tag_name: v${{ steps.version.outputs.version }}
           body_path: release_notes.md
           files: dist/*
-          
+
+      # Publish to PyPI
       - name: Publish to PyPI
+        if: steps.check_tag.outputs.exists != 'true'
         env:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
-        run: twine upload dist/*
+        run: twine upload dist/*