neuron-technologies/neuron-web
3
0
Fork 0
Code Issues 2 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Fix stage source check to use git parent instead of commit message parsing
Dev — Build & local smoke test / build-smoke (pull_request) Failing after 1m50s
Details

Browse Source
This commit is contained in:
Will Anderson
2026-05-09 15:09:38 -05:00
parent b39977b74c
commit 15c70f0e26
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitea/workflows/stage.yaml
+11 -1
View File
@@ -43,7 +43,17 @@ jobs:
echo "Merge commit: $COMMIT_MSG" echo "Merge commit: $COMMIT_MSG"
# Gitea merge commits: "Merge pull request '...' (#N) from dev into stage" # Gitea merge commits: "Merge pull request '...' (#N) from dev into stage"
# Direct branch merges: "Merge branch 'dev' into stage" # Direct branch merges: "Merge branch 'dev' into stage"
if echo "$COMMIT_MSG" | grep -qE " from dev into stage$| 'dev' into stage$"; then # tea pr merge with custom title: any subject line is possible, so
# fall back to checking git parents — if the second parent is on dev
# the merge came from dev regardless of the commit subject.
SECOND_PARENT=$(git log -1 --pretty=format:"%P" HEAD | awk '{print $2}')
FROM_DEV=""
if [ -n "$SECOND_PARENT" ]; then
if git merge-base --is-ancestor "$SECOND_PARENT" origin/dev 2>/dev/null; then
FROM_DEV=1
fi
fi
if echo "$COMMIT_MSG" | grep -qE " from dev into stage$| 'dev' into stage$" || [ -n "$FROM_DEV" ]; then
echo "Source branch check: OK (merged from dev)" echo "Source branch check: OK (merged from dev)"
else else
echo "ERROR: stage only accepts merges from dev." echo "ERROR: stage only accepts merges from dev."