From 28f3c0b95bb9e3d7a9abf0fbae2b5d7e6c60732c Mon Sep 17 00:00:00 2001 From: jnnsbrr Date: Wed, 24 Sep 2025 14:08:16 +0200 Subject: [PATCH 1/2] improve workflow for actual releases --- .github/workflows/release.yml | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 14def83..4df58bf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,6 +23,14 @@ jobs: run: | echo "🔍 Checking for version tags in this push to main/master..." + # Debug: Show recent commits + echo "Recent commits:" + git log --oneline -5 + + # Debug: Show all tags + echo "All tags:" + git tag -l | tail -10 + # Check if this push contains a commit with "Version" in the message # This indicates a release was created locally and pushed if git log --oneline -1 --grep="Version" | grep -q "Version"; then @@ -56,8 +64,30 @@ jobs: fi else echo "⚠️ No version commit found in this push" - echo "should_release=false" >> $GITHUB_OUTPUT - exit 0 + echo "Looking for any commit with 'Version' in the message..." + git log --oneline --grep="Version" -10 + + # Fallback: Check if there's a recent tag that might be from this push + echo "Checking for recent tags as fallback..." + LATEST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "") + if [ -n "$LATEST_TAG" ]; then + echo "Found latest tag: $LATEST_TAG" + # Check if this tag was created recently (within last 5 commits) + if git log --oneline -5 | grep -q "$LATEST_TAG"; then + VERSION=${LATEST_TAG#v} + echo "version=$VERSION" >> $GITHUB_OUTPUT + echo "tag_name=$LATEST_TAG" >> $GITHUB_OUTPUT + echo "✅ Using latest tag as fallback: $LATEST_TAG" + else + echo "Latest tag is not recent enough" + echo "should_release=false" >> $GITHUB_OUTPUT + exit 0 + fi + else + echo "No tags found at all" + echo "should_release=false" >> $GITHUB_OUTPUT + exit 0 + fi fi - name: Check if release should proceed From 1c05a6f370e2c05ef5c88b33e5b5a5d85f14c636 Mon Sep 17 00:00:00 2001 From: jnnsbrr Date: Wed, 24 Sep 2025 14:08:37 +0200 Subject: [PATCH 2/2] Version 1.6.5 --- CITATION.cff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CITATION.cff b/CITATION.cff index 27c059e..717cc8c 100644 --- a/CITATION.cff +++ b/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.4 +version: 1.6.5 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.