Skip to content

Fix sync-from-upstream overwriting existing update branch #147

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
fhielpos merged 1 commit into from
Apr 7, 2026
Merged

Fix sync-from-upstream overwriting existing update branch #147

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
15 changes: 11 additions & 4 deletions .github/workflows/sync-from-upstream.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,19 @@ jobs:
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
git config user.name "github-actions[bot]"
git fetch origin
git checkout main
git checkout -B "${{ inputs.update_branch }}"

# Use the existing remote branch if present; otherwise create from main
if git ls-remote --exit-code --heads origin "${{ inputs.update_branch }}" > /dev/null 2>&1; then
git checkout --track "origin/${{ inputs.update_branch }}"
else
git checkout main
git checkout -b "${{ inputs.update_branch }}"
fi

git checkout "origin/${{ github.ref_name }}" -- vendir.yml
git add vendir.yml
git commit -m "Update vendir.yml from upstream"
git push origin "${{ inputs.update_branch }}" --force
git diff --cached --quiet || git commit -m "Update vendir.yml from upstream"
git push origin "${{ inputs.update_branch }}"

call-update-chart:
needs: prepare-update-branch
Expand Down