Skip to content

Keep the additive resolver reachable after the upstream checkout #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danielhanchen merged 1 commit into from
Aug 6, 2026
+6 −1
Merged

Keep the additive resolver reachable after the upstream checkout #72

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .github/workflows/unsloth-prebuilt.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,11 @@ jobs:
# .github/workflows, which upstream history routinely does).
if [ "$EXISTS" != "true" ] || [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
git remote add upstream https://github.com/ggml-org/llama.cpp.git
# Checking out the upstream base replaces this working tree with
# upstream's, which has no scripts/unsloth/. Keep the resolver
# somewhere the checkout cannot take away.
ADDITIVE_MERGE="${RUNNER_TEMP}/additive_merge.py"
cp scripts/unsloth/additive_merge.py "$ADDITIVE_MERGE"
if [ "$(jq length <<<"$PRS")" != 0 ]; then
# Merges need a merge-base, so unshallow first.
if [ "$(git rev-parse --is-shallow-repository)" = "true" ]; then
Expand Down Expand Up @@ -290,7 +295,7 @@ jobs:
# additive_merge.py resolves only that, and refuses when
# either side edited existing text, so a real disagreement
# still hard-fails here rather than being papered over.
if python3 scripts/unsloth/additive_merge.py \
if python3 "$ADDITIVE_MERGE" \
&& [ -z "$(git diff --name-only --diff-filter=U)" ]; then
git -c user.name='github-actions[bot]' -c user.email='41898282+github-actions[bot]@users.noreply.github.com' \
commit -q --no-edit
Expand Down