implemented non tagging for non release branches

README.md

@@ -86,7 +86,7 @@ _NOTE: set the fetch-depth for `actions/checkout@v2` or newer to be sure you ret
 - **DEFAULT_BUMP** _(optional)_ - Which type of bump to use when none explicitly provided (default: `minor`).
 - **DEFAULT_BRANCH** _(optional)_ - Overwrite the default branch its read from GitHub Runner env var but can be overwritten (default: `$GITHUB_BASE_REF`). Strongly recommended to set this var if using anything else than master or main as default branch otherwise in combination with history full will error.
 - **WITH_V** _(optional)_ - Tag version with `v` character.
-- **RELEASE_BRANCHES** _(optional)_ - Comma separated list of branches (bash reg exp accepted) that will generate the release tags. Other branches and pull-requests generate versions postfixed with the commit hash and do not generate any tag. Examples: `master` or `.*` or `release.*,hotfix.*,master` ...
+- **RELEASE_BRANCHES** _(optional)_ - Comma separated list of branches (bash reg exp accepted) that will generate the release tags. Other branches and pull-requests generate versions postfixed with the branch name and do not generate any tag. Examples: `master` or `.*` or `release.*,hotfix.*,master` ...
 - **CUSTOM_TAG** _(optional)_ - Set a custom tag, useful when generating tag based on f.ex FROM image in a docker image. **Setting this tag will invalidate any other settings set!**
 - **SOURCE** _(optional)_ - Operate on a relative path under $GITHUB_WORKSPACE.
 - **DRY_RUN** _(optional)_ - Determine the next version without tagging the branch. The workflow can use the outputs `new_tag` and `tag` in subsequent steps. Possible values are `true` and `false` (default).

entrypoint.sh

@@ -63,21 +63,25 @@ setOutput() {
 
 current_branch=$(git rev-parse --abbrev-ref HEAD)
 
+release=false
 pre_release="$prerelease"
 IFS=',' read -ra branch <<< "$release_branches"
 for b in "${branch[@]}"; do
     # check if ${current_branch} is in ${release_branches} | exact branch match
     if [[ "$current_branch" == "$b" ]]
     then
         pre_release="false"
+        release=true
     fi
     # verify non specific branch names like  .* release/* if wildcard filter then =~
     if [ "$b" != "${b//[\[\]|.? +*]/}" ] && [[ "$current_branch" =~ $b ]]
     then
         pre_release="false"
+        release=true
     fi
 done
 echo "pre_release = $pre_release"
+echo "release = ${release}"
 
 # fetch tags
 git fetch --tags
@@ -224,6 +228,10 @@ else
     then
         new="v$new"
     fi
+    if ! $release
+    then
+      new="v${new}-${current_branch}"
+    fi
     echo -e "Bumping tag ${tag} - New tag ${new}"
 fi
 
@@ -240,7 +248,7 @@ setOutput "tag" "$new" # this needs to go in v2 is breaking change
 setOutput "old_tag" "$tag"
 
 # dry run exit without real changes
-if $dryrun
+if $dryrun || ! $release
 then
     exit 0
 fi