github/codeql-action
1
0
Fork 0
mirror of https://github.com/github/codeql-action.git synced 2026-10-03 09:14:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge in progress detection

Browse Source
This commit is contained in:
Henry Mercer
2026-03-11 18:23:04 +00:00
parent 44720043ea
commit 6fb1c2a300
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/rebuild.yml vendored
View File

@@ -55,8 +55,12 @@ jobs:
git fetch origin "$BASE_BRANCH"
# Allow merge conflicts in `lib`, since rebuilding should resolve them.
git merge "origin/$BASE_BRANCH" || echo "Merge conflicts detected, continuing."
MERGE_RESULT=$?
if git merge "origin/$BASE_BRANCH"; then
MERGE_RESULT=0
else
MERGE_RESULT=$?
echo "Merge conflicts detected, continuing."
fi
if [ "$MERGE_RESULT" -ne 0 ]; then
echo "merge-in-progress=true" >> $GITHUB_OUTPUT