From 6477233355a994bc2f7271c62d3a5ef9dbdb7332 Mon Sep 17 00:00:00 2001 From: Angel Montenegro Date: Mon, 15 Jun 2026 13:07:37 -0600 Subject: [PATCH 1/3] Refactor commit message checks in version-bump.sh Updated version-bump.sh to check commits_for_bump instead of merge_commit for feature and fix detection. --- version-bump.sh | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/version-bump.sh b/version-bump.sh index 985770b..9c9edd3 100755 --- a/version-bump.sh +++ b/version-bump.sh @@ -175,22 +175,20 @@ fi # Allow git commit messages to override bump value # Check for #major or #minor in commit message and increment the relevant version number -merge_commit=$(git log --merges -n 1) - +echo "----------------------------------------------" +echo "---------- version-bump-action ---------------" +echo "----------------------------------------------" echo "commits_for_bump:" echo "$commits_for_bump" echo " " echo "----------------------------------------------" -echo " " -echo "merge_commit:" -echo "$merge_commit" -if grep -qE 'feat' <<< $(echo $merge_commit);then +if grep -qE 'feat' <<< $(echo $commits_for_bump);then echo "feature git commit detected" minor=1 fi -if grep -qE 'fix|bug|patch|test' <<< $(echo $merge_commit);then +if grep -qE 'fix|bug|patch|test' <<< $(echo $commits_for_bump);then echo "fix|bug|patch|test git commit detected" patch=1 fi From 0333a117a36751f69debc4ee5839b953e2b4cb3b Mon Sep 17 00:00:00 2001 From: amontenegro Date: Mon, 15 Jun 2026 13:27:24 -0600 Subject: [PATCH 2/3] Use the default branch --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 55adaaf..598d42e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -90,7 +90,7 @@ jobs: echo 'merge-test' > merge-test git add merge-test git commit -m "merge-test" - git checkout main + git checkout ${{ github.event.repository.default_branch }} git merge feat/merge-test --no-ff --commit --no-edit git log From bf9b5e7d7a4c62e94a7a5e530c0af145d097921c Mon Sep 17 00:00:00 2001 From: amontenegro Date: Mon, 15 Jun 2026 13:35:29 -0600 Subject: [PATCH 3/3] Trying to fix unit tests --- .github/workflows/test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 598d42e..1b4d8c4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -84,13 +84,14 @@ jobs: git --version git config user.name "GitHub Actions Bot" git config user.email "<>" + git fetch origin main # Add this line to fetch the main branch git branch feat/merge-test git switch feat/merge-test touch merge-test echo 'merge-test' > merge-test git add merge-test git commit -m "merge-test" - git checkout ${{ github.event.repository.default_branch }} + git checkout main # Use explicit branch name instead of variable git merge feat/merge-test --no-ff --commit --no-edit git log