diff --git a/VERSION b/VERSION index affb129..cda6f12 100755 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.5.6-develop16 +4.5.6-develop17 diff --git a/scripts/pre-commit/increase_version.sh b/scripts/pre-commit/increase_version.sh index 9f87e24..bdd0b77 100755 --- a/scripts/pre-commit/increase_version.sh +++ b/scripts/pre-commit/increase_version.sh @@ -23,6 +23,9 @@ if [[ "$IN_CI" == "true" ]]; then CURRENT_BRANCH_CI="${GITHUB_HEAD_REF:-$(git rev-parse --abbrev-ref HEAD 2>/dev/null || echo '')}" if [[ "$CURRENT_BRANCH_CI" == *"develop"* ]]; then BASE_REF="develop" + elif grep -q "develop" VERSION 2>/dev/null; then + # If VERSION contains "develop" but branch doesn't, still assume base is "develop" + BASE_REF="develop" else BASE_REF="$DEFAULT_BASE" fi