improve workflow

Author: jnnsbrr

.github/workflows/release.yml

@@ -5,19 +5,19 @@ on:
     tags: ['v*']
 
 jobs:
-  release:
+  check-tag:
     runs-on: ubuntu-latest
-    permissions:
-      contents: write
-
+    outputs:
+      should-release: ${{ steps.check.outputs.should-release }}
     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: Verify tag is on main/master branch
+    - name: Check if tag is on main/master branch
+      id: check
       run: |
         # Get the commit that the tag points to
         TAG_COMMIT=$(git rev-list -n 1 ${{ github.ref_name }})
@@ -26,14 +26,30 @@ jobs:
         # 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
         else
-          echo "❌ Tag ${{ github.ref_name }} is NOT on main/master branch"
+          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."
-          exit 1
+          echo "To release, merge your changes to main/master first, then tag from there."
+          echo "should-release=false" >> $GITHUB_OUTPUT
         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: Set up Python
       uses: actions/setup-python@v5
       with:

CITATION.cff

@@ -2,7 +2,7 @@ cff-version: 1.2.0
 message: If you use this software, please cite it using the metadata from this file.
 type: software
 title: 'pycoupler: dynamic model coupling of LPJmL'
-version: 1.6.2
+version: 1.6.3
 date-released: '2025-09-22'
 abstract: An LPJmL-Python interface for operating LPJmL in a Python environment
   and coupling it with Python models, programmes or simple programming scripts.

pycoupler/release.py

@@ -338,7 +338,7 @@ def main():
         print("CITATION.cff updated, committing changes...")
         run_command("git add CITATION.cff", "Adding CITATION.cff to staging")
         run_command(
-            f'git commit -m "Release version {version}\\n\\n- Update CITATION.cff to version {version}"',  # noqa: E501
+            f'git commit -m "Version {version}"',
             "Committing CITATION.cff changes",
         )
         print("CITATION.cff changes committed successfully.")