molecule-ai/molecule-sdk-python
35
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(ci): don't fetch into checked-out staging

Browse Source
This commit is contained in:
Hongming Wang 2026-04-24 08:10:08 -07:00
parent 283465efb6
commit 28023e20d6
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.github/workflows/auto-promote-staging.yml vendored
View File

@ -97,19 +97,20 @@ jobs:
git config user.email "actions@github.com" git config user.email "actions@github.com"
git config user.name "github-actions[bot]" git config user.name "github-actions[bot]"
git fetch origin main:main staging:staging 2>&1 # staging is the checked-out branch (workflow fires on push to
# staging). Can't fetch into it. Fetch main into a local main.
git fetch origin main
git checkout -B main origin/main
# Check if main is already at or ahead of staging — nothing to do. # Check if main is already at or ahead of origin/staging.
if git merge-base --is-ancestor staging main 2>/dev/null; then if git merge-base --is-ancestor origin/staging main 2>/dev/null; then
echo "main already contains staging; nothing to promote." echo "main already contains staging; nothing to promote."
exit 0 exit 0
fi fi
git checkout main
# --ff-only refuses if main has independent commits not on # --ff-only refuses if main has independent commits not on
# staging (divergence — hotfix direct to main). Human resolves. # staging (divergence — hotfix direct to main). Human resolves.
if ! git merge --ff-only staging 2>&1; then if ! git merge --ff-only origin/staging 2>&1; then
echo "::warning::main has diverged from staging — refusing fast-forward. Resolve manually (likely a direct-to-main commit exists that staging doesn't have)." echo "::warning::main has diverged from staging — refusing fast-forward. Resolve manually (likely a direct-to-main commit exists that staging doesn't have)."
exit 0 exit 0
fi fi