Fix upstream-sync workflow silently failing on conflict - #15
Merged
Merged
Conversation
The conflict path did `git merge --abort` and just failed the run, relying on the failed Actions run itself as the "alert" since issues are disabled on this repo. That's not visible enough - the workflow sat broken for weeks (129 -> 381 commits behind) before anyone noticed. Now commits the conflicted merge as-is with conflict markers and opens a PR flagging the conflict, same pattern as the other Xenia forks' upstream-sync workflows. Also adds `workflows: write` permission (needed to push a diff that touches .github/workflows/, which this fork's conflicts routinely do) and skips creating a duplicate PR while one is already open. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
|
Artifact containing the AppImage: nextcloud-appimage-pr-15.zip Digest: To test this change/fix you can download the above artifact file, unzip it, and run it. Please make sure to quit your existing Nextcloud app and backup your data. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
The scheduled
Upstream Syncworkflow (.github/workflows/upstream-sync.yml) has been failing silently every Monday since 2026-09-14: on a merge conflict it rangit merge --abortand just failed the Actions run, treating the failed run itself as the "alert." Since issues are disabled on this repo, nothing ever surfaced it to anyone, and the fork drifted from 129 to 381 commits behind before this was noticed (see PR #14, the manual catch-up).Fix
workflows: writepermission — needed because this fork's conflicts routinely touch files under.github/workflows/(e.g.linux-appimage.yml,sonarcloud.yml), andGITHUB_TOKENcan't push such a diff without it; previously this was worked around by discarding workflow-file changes on clean merges, which no longer applies now that conflicted merges need to push them too.sync/upstream-*head).Tested: YAML validated with
yaml.safe_load; logic not run against a real Actions runner in this PR — recommend aworkflow_dispatchrun after merge to confirm end-to-end.🤖 Generated with Claude Code