From 7eea559b5aca5e2c69609cc8e0ac304ae8ea483d Mon Sep 17 00:00:00 2001 From: "Viktor H. Ingre" Date: Sun, 7 Dec 2025 22:07:13 +0100 Subject: [PATCH 1/2] fix(ci): support squash merges for version bumps - Detect squash merges by checking for PR number in commit message - Query GitHub API to get source branch for squash merges - Update both update-version and sync_branches jobs - Fix version calculation to handle squash merges - Resolves issue where beta->main squash merge didn't update VERSION --- .github/workflows/ci-cd-versioned.yml | 91 ++++++++++++++++----------- 1 file changed, 54 insertions(+), 37 deletions(-) diff --git a/.github/workflows/ci-cd-versioned.yml b/.github/workflows/ci-cd-versioned.yml index 16409bf..355ab3d 100644 --- a/.github/workflows/ci-cd-versioned.yml +++ b/.github/workflows/ci-cd-versioned.yml @@ -128,9 +128,8 @@ jobs: TAG="" IS_RELEASE="false" else - # Push to main after PR merge: Detect bump from actual merge commit parents - # A merge commit has 2 parents: the target branch and the source branch - # We can check which branch the second parent belongs to + # Push to main after PR merge: Detect bump from merge commit or squash merge + BRANCH_TYPE="" if git rev-parse HEAD^2 &>/dev/null; then # This is a merge commit (has 2 parents) @@ -138,7 +137,6 @@ jobs: # Check which branches contain this commit # The source branch should contain the second parent - BRANCH_TYPE="" # Check if commit came from alpha if git branch -r --contains "$MERGE_COMMIT_PARENT" | grep -q "origin/alpha"; then @@ -152,35 +150,37 @@ jobs: # Check if commit came from bugfix/* elif git branch -r --contains "$MERGE_COMMIT_PARENT" | grep -q "origin/bugfix/"; then BRANCH_TYPE="bugfix" - else - # Could be from a deleted branch - try to get PR info from GitHub API - MERGE_COMMIT_MSG=$(git log -1 --pretty=%B) - PR_NUMBER=$(echo "$MERGE_COMMIT_MSG" | grep -oP '\(#\K[0-9]+(?=\))' || echo "") - - if [ -n "$PR_NUMBER" ]; then - PR_INFO=$(curl -s -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \ - "https://api.github.com/repos/${{ github.repository }}/pulls/$PR_NUMBER") - LAST_PR_BRANCH=$(echo "$PR_INFO" | grep -oP '"ref":\s*"\K[^"]+' | head -1) - - if [[ "$LAST_PR_BRANCH" == "alpha" ]]; then - BRANCH_TYPE="alpha" - elif [[ "$LAST_PR_BRANCH" == "beta" ]]; then - BRANCH_TYPE="beta" - elif [[ "$LAST_PR_BRANCH" =~ ^feature/ ]]; then - BRANCH_TYPE="feature" - elif [[ "$LAST_PR_BRANCH" =~ ^bugfix/ ]]; then - BRANCH_TYPE="bugfix" - fi - fi fi + fi + + # If not a merge commit or branch not found, check for squash merge via API + if [ -z "$BRANCH_TYPE" ]; then + MERGE_COMMIT_MSG=$(git log -1 --pretty=%B) + PR_NUMBER=$(echo "$MERGE_COMMIT_MSG" | grep -oP '\(#\K[0-9]+(?=\))' || echo "") - if [ -z "$BRANCH_TYPE" ]; then - BRANCH_TYPE="unknown" - echo "⚠ī¸ Warning: Could not determine source branch type" + if [ -n "$PR_NUMBER" ]; then + echo "🔍 Detected PR #${PR_NUMBER}, querying GitHub API for source branch..." + PR_INFO=$(curl -s -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \ + "https://api.github.com/repos/${{ github.repository }}/pulls/$PR_NUMBER") + LAST_PR_BRANCH=$(echo "$PR_INFO" | grep -oP '"ref":\s*"\K[^"]+' | head -1) + + if [[ "$LAST_PR_BRANCH" == "alpha" ]]; then + BRANCH_TYPE="alpha" + elif [[ "$LAST_PR_BRANCH" == "beta" ]]; then + BRANCH_TYPE="beta" + elif [[ "$LAST_PR_BRANCH" =~ ^feature/ ]]; then + BRANCH_TYPE="feature" + elif [[ "$LAST_PR_BRANCH" =~ ^bugfix/ ]]; then + BRANCH_TYPE="bugfix" + fi + + echo "✅ Source branch from API: ${LAST_PR_BRANCH} -> type: ${BRANCH_TYPE}" fi - else - # Not a merge commit, treat as direct push + fi + + if [ -z "$BRANCH_TYPE" ]; then BRANCH_TYPE="unknown" + echo "⚠ī¸ Warning: Could not determine source branch type" fi case "$BRANCH_TYPE" in @@ -488,16 +488,26 @@ jobs: fetch-depth: 0 token: ${{ secrets.GITHUB_TOKEN }} - - name: Check if merge commit + - name: Check if merge commit or squash merge id: check_merge run: | # Check if this is a merge commit (has 2 parents) if git rev-parse HEAD^2 &>/dev/null; then echo "is_merge=true" >> $GITHUB_OUTPUT - echo "✅ This is a merge commit" + echo "merge_type=merge" >> $GITHUB_OUTPUT + echo "✅ This is a merge commit (2 parents)" else - echo "is_merge=false" >> $GITHUB_OUTPUT - echo "ℹī¸ This is a direct commit, skipping VERSION update" + # Check if this is a squash merge by looking for PR number + COMMIT_MSG=$(git log -1 --pretty=%B) + if [[ "$COMMIT_MSG" =~ \(#[0-9]+\) ]]; then + echo "is_merge=true" >> $GITHUB_OUTPUT + echo "merge_type=squash" >> $GITHUB_OUTPUT + echo "✅ This is a squash merge (PR found in commit message)" + else + echo "is_merge=false" >> $GITHUB_OUTPUT + echo "merge_type=none" >> $GITHUB_OUTPUT + echo "ℹī¸ This is a direct commit, skipping VERSION update" + fi fi - name: Update VERSION file @@ -582,16 +592,23 @@ jobs: git config user.name "github-actions[bot]" git config user.email "github-actions[bot]@users.noreply.github.com" - - name: Check if merge commit + - name: Check if merge commit or squash merge id: check_merge run: | # Check if this is a merge commit (has 2 parents) if git rev-parse HEAD^2 &>/dev/null; then echo "is_merge=true" >> $GITHUB_OUTPUT - echo "✅ This is a merge commit" + echo "✅ This is a merge commit (2 parents)" else - echo "is_merge=false" >> $GITHUB_OUTPUT - echo "ℹī¸ This is a direct commit, skipping branch sync" + # Check if this is a squash merge by looking for PR number + COMMIT_MSG=$(git log -1 --pretty=%B) + if [[ "$COMMIT_MSG" =~ \(#[0-9]+\) ]]; then + echo "is_merge=true" >> $GITHUB_OUTPUT + echo "✅ This is a squash merge (PR found in commit message)" + else + echo "is_merge=false" >> $GITHUB_OUTPUT + echo "ℹī¸ This is a direct commit, skipping branch sync" + fi fi - name: Create beta branch if needed From 981bc17ea5974801a4ff25244ca026ccf245e641 Mon Sep 17 00:00:00 2001 From: "Viktor H. Ingre" Date: Sun, 7 Dec 2025 22:07:41 +0100 Subject: [PATCH 2/2] fix(version): correct VERSION to 1.0.0-beta after beta merge The beta->main PR merge was a squash merge, so the workflow didn't detect it and failed to update VERSION. This commit corrects the VERSION file manually while the workflow fix ensures future squash merges are handled properly. --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index dadcca1..896b9bc 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.0-alpha +1.0.0-beta