Microsoft/bcquality
1
0
Fork 0
mirror of https://github.com/microsoft/BCQuality.git synced 2026-08-06 17:36:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update sync-fork.yml

Browse source
This commit is contained in:
Beytullah Cengiz 2026-07-02 15:10:38 +02:00 • committed by github-actions[bot]
parent d71d3d1cb7
commit cfcf16a00e
1 changed files with 2 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
.github/workflows/sync-fork.yml vendored
View file

@ -21,9 +21,7 @@ jobs:
- name: Sync from upstream - name: Sync from upstream
env: env:
# IMPORTANT: change this to the original source repository
UPSTREAM_REPO: "microsoft/BCQuality" UPSTREAM_REPO: "microsoft/BCQuality"
# Optional: set your branch explicitly if not default branch behavior
TARGET_BRANCH: "main" TARGET_BRANCH: "main"
run: | run: |
set -euo pipefail set -euo pipefail
@ -31,22 +29,15 @@ jobs:
git config user.name "github-actions[bot]" git config user.name "github-actions[bot]"
git config user.email "41898282+github-actions[bot]@users.noreply.github.com" git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
# Ensure we're on target branch
git checkout "${TARGET_BRANCH}" git checkout "${TARGET_BRANCH}"
# Add/update upstream remote
if git remote get-url upstream >/dev/null 2>&1; then if git remote get-url upstream >/dev/null 2>&1; then
git remote set-url upstream "https://github.com/${UPSTREAM_REPO}.git" git remote set-url upstream "https://github.com/${UPSTREAM_REPO}.git"
else else
git remote add upstream "https://github.com/${UPSTREAM_REPO}.git" git remote add upstream "https://github.com/${UPSTREAM_REPO}.git"
fi fi
# Fetch and fast-forward only
git fetch upstream git fetch upstream
git merge --ff-only "upstream/${TARGET_BRANCH}" || { git rebase "upstream/${TARGET_BRANCH}"
echo "Fast-forward failed (diverged history). Manual intervention required." git push --force-with-lease origin "${TARGET_BRANCH}"
exit 1
}
# Push only if branch moved
git push origin "${TARGET_BRANCH}" git push origin "${TARGET_BRANCH}"