Skip to content

ci(hotfix): cap auto-hotfix fan-out at 25.9, exclude main #2065

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
benflexcompute merged 1 commit into from
Jun 15, 2026
Merged

ci(hotfix): cap auto-hotfix fan-out at 25.9, exclude main #2065

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions .github/workflows/create-hotfix-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ jobs:
env:
BOT_NAME: "flow360-auto-hotfix-bot" # Name for the git committer
BOT_EMAIL: "flow360-auto-hotfix-bot@users.noreply.github.com" # Email for the git committer
# Auto-hotfix is capped at this release-candidate version. Branches above it
# (e.g. 25.10, 25.11, 26.x) and main are intentionally NOT targeted.
# Bump this when a newer line should start receiving auto-hotfixes.
# Format: normalized YY.MM with zero-padded minor (25.9 -> "25.09").
MAX_HOTFIX_VERSION: "25.09"

steps:

Expand Down Expand Up @@ -49,7 +54,7 @@ jobs:
PR_BASE_BRANCH="${{ steps.get_commit.outputs.base_branch }}"
echo "PR was merged into: $PR_BASE_BRANCH"

TARGET_BRANCHES=("main") # Always target main for hotfix
TARGET_BRANCHES=() # main is intentionally excluded; only release-candidate branches up to MAX_HOTFIX_VERSION are targeted

# Get all remote 'release-candidate' branches with version pattern as YY.I or YY.II
ALL_RELEASE_CANDIDATE_BRANCHES=$(git branch -r | grep 'origin/release-candidate/' | sed 's/.*origin\///' | grep -E '^release-candidate/[0-9]{2}\.[0-9]{1,2}$' | sort -V)
Expand All @@ -75,10 +80,12 @@ jobs:
BRANCH_VERSION=$(echo "$BRANCH_VERSION" | awk '{printf "%s%02d", substr($1,1,3), substr($1,4)}')
fi

# Compare versions
if (( $(echo "$BRANCH_VERSION > $PR_BASE_VERSION" | bc -l) )); then
# Target branches higher than the PR base but not above the auto-hotfix cap.
if (( $(echo "$BRANCH_VERSION > $PR_BASE_VERSION" | bc -l) )) && (( $(echo "$BRANCH_VERSION <= $MAX_HOTFIX_VERSION" | bc -l) )); then
TARGET_BRANCHES+=("$branch")
echo "Adding $branch (version $BRANCH_VERSION) as it's higher than $PR_BASE_BRANCH (version $PR_BASE_VERSION)"
echo "Adding $branch (version $BRANCH_VERSION): higher than $PR_BASE_BRANCH ($PR_BASE_VERSION) and within cap $MAX_HOTFIX_VERSION"
elif (( $(echo "$BRANCH_VERSION > $MAX_HOTFIX_VERSION" | bc -l) )); then
echo "Skipping $branch (version $BRANCH_VERSION): above auto-hotfix cap $MAX_HOTFIX_VERSION"
fi
fi
done
Expand Down
Loading