Skip to content

Commit b31fa6b

Browse files
committed
feat: add verification step for develop branch commits in beta release workflow
1 parent af48aec commit b31fa6b

1 file changed

Lines changed: 33 additions & 0 deletions

File tree

.github/workflows/beta-release.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,39 @@ jobs:
3131
with:
3232
fetch-depth: 0
3333

34+
- name: Verify develop commits included
35+
run: |
36+
# Get current branch name
37+
CURRENT_BRANCH="${GITHUB_REF#refs/heads/}"
38+
echo "🔍 Current branch: $CURRENT_BRANCH"
39+
40+
# Skip check if we're on develop branch itself
41+
if [ "$CURRENT_BRANCH" = "develop" ]; then
42+
echo "✅ Running on develop branch - skipping verification"
43+
exit 0
44+
fi
45+
46+
# Fetch develop branch
47+
git fetch origin develop 2>/dev/null || true
48+
if ! git rev-parse --verify origin/develop >/dev/null 2>&1; then
49+
echo "⚠️ Develop branch not found - skipping verification"
50+
exit 0
51+
fi
52+
53+
# Check if develop is an ancestor of current branch (all develop commits are included)
54+
if git merge-base --is-ancestor origin/develop HEAD; then
55+
echo "✅ All commits from develop are included in $CURRENT_BRANCH"
56+
else
57+
echo "❌ ERROR: Current branch is missing commits from develop!"
58+
echo ""
59+
echo "Please merge or rebase develop into your feature branch:"
60+
echo " git checkout $CURRENT_BRANCH"
61+
echo " git merge origin/develop"
62+
echo " # or"
63+
echo " git rebase origin/develop"
64+
exit 1
65+
fi
66+
3467
- name: Setup Node.js
3568
uses: actions/setup-node@v4
3669
with:

0 commit comments

Comments
 (0)