hanzoai/dev
2
0
Fork 0
mirror of https://github.com/hanzoai/dev.git synced 2026-10-25 03:32:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci(upstream-merge): skip when origin/upstream-merge already contains upstream + default tips

Browse Source
This commit is contained in:
James Peter
2025-09-07 18:29:13 +10:00
parent a8c7535c4d
commit aae9f7ce54
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/upstream-merge.yml
+10
View File
@@ -138,6 +138,16 @@ jobs:
git remote add upstream "https://github.com/${UPSTREAM_REPO}.git" 2>/dev/null || true git remote add upstream "https://github.com/${UPSTREAM_REPO}.git" 2>/dev/null || true
git fetch origin --depth=1 git fetch origin --depth=1
git fetch upstream --depth=1 "${UPSTREAM_BRANCH}" git fetch upstream --depth=1 "${UPSTREAM_BRANCH}"
# Extra short-circuit: if origin/upstream-merge already contains both
# current tips (upstream and default), there is nothing new to do.
if git ls-remote --exit-code --heads origin upstream-merge >/dev/null 2>&1; then
if git merge-base --is-ancestor "upstream/${UPSTREAM_BRANCH}" "origin/upstream-merge" \
&& git merge-base --is-ancestor "origin/${DEFAULT_BRANCH}" "origin/upstream-merge"; then
echo "skip=true" >> "$GITHUB_OUTPUT"
echo "Upstream and default are already included in origin/upstream-merge; skipping agent run."
exit 0
fi
fi
if git merge-base --is-ancestor "upstream/${UPSTREAM_BRANCH}" "origin/${DEFAULT_BRANCH}"; then if git merge-base --is-ancestor "upstream/${UPSTREAM_BRANCH}" "origin/${DEFAULT_BRANCH}"; then
echo "skip=true" >> "$GITHUB_OUTPUT" echo "skip=true" >> "$GITHUB_OUTPUT"
echo "No new upstream commits; skipping agent run." echo "No new upstream commits; skipping agent run."
.wt-upstream-merge-clean
Submodule
+1
Submodule .wt-upstream-merge-clean added at fcaa136239