From d5c8f4de1e578d89ee11c807f12a4d6448ee8b06 Mon Sep 17 00:00:00 2001 From: Florian Ruppel Date: Fri, 5 Jun 2026 17:03:57 +0200 Subject: [PATCH] fix: version logic --- versions/print_versions.bash | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/versions/print_versions.bash b/versions/print_versions.bash index a04b257..59fa304 100755 --- a/versions/print_versions.bash +++ b/versions/print_versions.bash @@ -18,16 +18,15 @@ get_tags_without_rc() { } get_next_minor_and_patch() { - DAY_OF_WEEK=$(date --utc +%u) # 1=Monday, 7=Sunday - DAY_NEXT_MONDAY=$(date --utc --date="+$((8 - ${DAY_OF_WEEK})) days" +%d) - version=${1} local max_tag=$(get_tags_without_rc | grep -E "^${version}" | tail -n 1) if [[ -z $max_tag ]]; then max_tag=$(get_tags | grep -E "^${version}" | tail -n 1) fi IFS='.' read -r -a parts <<<"${max_tag}" - if [ "$DAY_NEXT_MONDAY" -lt 7 ]; then + + local next_release_branch="${parts[0]#v}.${parts[1]}.$((${parts[2]} + 1)).x" + if gh api "repos/shopware/shopware/branches/${next_release_branch}" --silent 2>/dev/null; then echo "NEXT_MINOR=${parts[0]}.${parts[1]}.$((${parts[2]} + 2)).0" else echo "NEXT_MINOR=${parts[0]}.${parts[1]}.$((${parts[2]} + 1)).0"