diff --git a/.github/workflows/post_draft_release_published.yaml b/.github/workflows/post_draft_release_published.yaml index f9b80dfdb..3cecc7e59 100644 --- a/.github/workflows/post_draft_release_published.yaml +++ b/.github/workflows/post_draft_release_published.yaml @@ -47,18 +47,6 @@ jobs: git add src/datajoint/version.py git commit -m "Update version.py to $VERSION" echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_ENV - - name: Update README.md badge - run: | - # commits since the last release - NEW_HREF="https://github.com/datajoint/datajoint-python/compare/${{ github.event.release.tag_name }}...master" - NEW_SRC="https://img.shields.io/github/commits-since/datajoint/datajoint-python/${{ github.event.release.tag_name }}?color=red" - # Update href in the tag - sed -i 's|\(]*href="\)[^"]*\(".*\)|\1'"$NEW_HREF"'\2|' README.md - # Update src in the tag - sed -i 's|\(]*src="\)[^"]*\(".*\)|\1'"$NEW_SRC"'\2|' README.md - git add README.md - # Only commit if there are changes (handles re-runs gracefully) - git diff --cached --quiet README.md || git commit -m "Update README.md badge to ${{ github.event.release.tag_name }}" - name: Set up Python ${{matrix.py_ver}} uses: actions/setup-python@v5 with: diff --git a/RELEASE_MEMO.md b/RELEASE_MEMO.md index 73700b602..7fb46cf30 100644 --- a/RELEASE_MEMO.md +++ b/RELEASE_MEMO.md @@ -4,13 +4,7 @@ | Branch | Purpose | Version | |--------|---------|---------| -| `master` | Main development | 2.1.x | -| `maint/2.0` | Maintenance releases | 2.0.x | - -For 2.0.x bugfixes: -1. Commit to `maint/2.0` -2. Tag and release as v2.0.x -3. Cherry-pick to master if applicable +| `master` | Main development | 2.3.x | --- @@ -68,10 +62,11 @@ The release drafter uses PR labels to categorize changes: | Label | Category | |-------|----------| -| `breaking` | BREAKING CHANGES | -| `enhancement` | Added | -| `bug` | Fixed | -| `documentation` | (usually excluded) | +| `breaking` | 💥 Breaking Changes | +| `feature` | 🚀 Features | +| `enhancement` | ⚡️ Enhancements | +| `bug` | 🐛 Bug Fixes | +| `documentation` | 📝 Documentation | Ensure PRs have appropriate labels before merging. @@ -215,6 +210,7 @@ After build completes: - @datajointbot - @dimitri-yatsenko +- @MilagrosMarin - @ttngu207 ## Links diff --git a/src/datajoint/version.py b/src/datajoint/version.py index 15acad8aa..b7d6af275 100644 --- a/src/datajoint/version.py +++ b/src/datajoint/version.py @@ -1,4 +1,4 @@ # version bump auto managed by Github Actions: -# label_prs.yaml(prep), release.yaml(bump), post_release.yaml(edit) +# draft_release.yaml (draft), post_draft_release_published.yaml (bump + PR) # manually set this version will be eventually overwritten by the above actions __version__ = "2.3.1"