From 2d89db1e5459794921aaf1a8695492cf7f8b56b4 Mon Sep 17 00:00:00 2001 From: jgostick Date: Sun, 22 Mar 2026 18:50:32 -0400 Subject: [PATCH 1/4] changing release to main in bump-version --- .github/workflows/bump-version.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml index c8a2568..127226d 100644 --- a/.github/workflows/bump-version.yml +++ b/.github/workflows/bump-version.yml @@ -2,7 +2,7 @@ name: Bump Version on: push: - branches: [dev, release] + branches: [dev, main] jobs: bump: @@ -34,11 +34,13 @@ jobs: git commit --amend --no-edit git push - - name: Bump version (release) - if: github.ref == 'refs/heads/release' + - name: Bump version (main) + if: github.ref == 'refs/heads/main' run: | if [[ "${{ github.event.head_commit.message }}" == *"#patch"* ]]; then uvx bump-my-version bump patch + elif [[ "${{ github.event.head_commit.message }}" == *"#feature"* ]]; then + uvx bump-my-version bump minor elif [[ "${{ github.event.head_commit.message }}" == *"#minor"* ]]; then uvx bump-my-version bump minor elif [[ "${{ github.event.head_commit.message }}" == *"#major"* ]]; then @@ -50,9 +52,9 @@ jobs: git push --follow-tags - name: Merge release back into dev - if: github.ref == 'refs/heads/release' + if: github.ref == 'refs/heads/main' run: | git fetch origin dev git checkout dev - git merge --no-ff origin/release -m "maint: merge release into dev [skip bump]" + git merge --no-ff origin/release -m "maint: merge main into dev [skip bump]" git push origin dev From 619c9ce05dae75dbd853e5d59cf0cc8657eb58e7 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Sun, 22 Mar 2026 22:50:49 +0000 Subject: [PATCH 2/4] =?UTF-8?q?maint:=20bump=20version:=200.0.1-dev22=20?= =?UTF-8?q?=E2=86=92=200.0.1-dev23=20[skip=20bump]=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pyproject.toml | 4 ++-- uv.lock | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 259a2d8..c1202a5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "kabs" -version = "0.0.1-dev22" +version = "0.0.1-dev23" description = "A tool for finding the absolute permeability from a volumetric image using the lattice Boltzmann method" readme = "README.md" requires-python = ">=3.12" @@ -31,7 +31,7 @@ dev = [ ] [tool.bumpversion] -current_version = "0.0.1-dev22" +current_version = "0.0.1-dev23" parse = """(?x) (?P0|[1-9]\\d*)\\. (?P0|[1-9]\\d*)\\. diff --git a/uv.lock b/uv.lock index 26bd368..14ed980 100644 --- a/uv.lock +++ b/uv.lock @@ -819,7 +819,7 @@ wheels = [ [[package]] name = "kabs" -version = "0.0.1.dev22" +version = "0.0.1.dev23" source = { editable = "." } dependencies = [ { name = "imageio" }, From 46fd52b767de752546d7ee0e7137894693e6e7e5 Mon Sep 17 00:00:00 2001 From: jgostick Date: Sun, 22 Mar 2026 18:56:24 -0400 Subject: [PATCH 3/4] oops missed one --- .github/workflows/bump-version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml index 127226d..546df1e 100644 --- a/.github/workflows/bump-version.yml +++ b/.github/workflows/bump-version.yml @@ -56,5 +56,5 @@ jobs: run: | git fetch origin dev git checkout dev - git merge --no-ff origin/release -m "maint: merge main into dev [skip bump]" + git merge --no-ff origin/main -m "maint: merge main into dev [skip bump]" git push origin dev From 883ab53a71c6f7da61ec0a72359939ced6be31ff Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Sun, 22 Mar 2026 22:56:49 +0000 Subject: [PATCH 4/4] =?UTF-8?q?maint:=20bump=20version:=200.0.1-dev23=20?= =?UTF-8?q?=E2=86=92=200.0.1-dev24=20[skip=20bump]=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pyproject.toml | 4 ++-- uv.lock | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index c1202a5..7d837a5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "kabs" -version = "0.0.1-dev23" +version = "0.0.1-dev24" description = "A tool for finding the absolute permeability from a volumetric image using the lattice Boltzmann method" readme = "README.md" requires-python = ">=3.12" @@ -31,7 +31,7 @@ dev = [ ] [tool.bumpversion] -current_version = "0.0.1-dev23" +current_version = "0.0.1-dev24" parse = """(?x) (?P0|[1-9]\\d*)\\. (?P0|[1-9]\\d*)\\. diff --git a/uv.lock b/uv.lock index 14ed980..b5b0639 100644 --- a/uv.lock +++ b/uv.lock @@ -819,7 +819,7 @@ wheels = [ [[package]] name = "kabs" -version = "0.0.1.dev23" +version = "0.0.1.dev24" source = { editable = "." } dependencies = [ { name = "imageio" },