fix(ci): the nightly manifest is edited on a stale master #2

2026-09-03T18:37:52Z

dtourolle commented

2026-09-03 18:37:52 +00:00

The nightly build has been red since 2026-08-12 (run 1045) on the manifest push:

! [rejected]  master -> master (non-fast-forward)

git checkout master after git fetch origin master switches to the local master -- the one actions/checkout left at this run own SHA -- not the ref just fetched. A nightly takes long enough that master has usually moved by the time it finishes, so the new version entry is prepended to a stale manifest and the push is rejected. The log says so plainly one line before the commit: "Your branch is behind origin/master by 1 commit, and can be fast-forwarded."

checkout -B master origin/master fixes it, and it is the correct base rather than just a working one: the step appends one entry to the manifest as it stands on master, so that is what it has to edit. Editing this build starting copy and forcing it through would silently drop whatever landed in between.

🤖 Generated with Claude Code

The nightly build has been red since 2026-08-12 (run 1045) on the manifest push: ! [rejected] master -> master (non-fast-forward) `git checkout master` after `git fetch origin master` switches to the **local** master -- the one `actions/checkout` left at this run own SHA -- not the ref just fetched. A nightly takes long enough that master has usually moved by the time it finishes, so the new version entry is prepended to a stale manifest and the push is rejected. The log says so plainly one line before the commit: "Your branch is behind origin/master by 1 commit, and can be fast-forwarded." `checkout -B master origin/master` fixes it, and it is the correct base rather than just a working one: the step appends one entry to the manifest **as it stands on master**, so that is what it has to edit. Editing this build starting copy and forcing it through would silently drop whatever landed in between. 🤖 Generated with [Claude Code](https://claude.com/claude-code)

dtourolle added 1 commit 2026-09-03 18:37:55 +00:00

fix(ci): the nightly manifest is edited on a stale master

🧪 Test Plugin / test (pull_request) Successful in 45s

Details

🏗️ Build Plugin / build (pull_request) Successful in 3m1s

Details

7e1973aca7

`git checkout master` after `git fetch origin master` switches to the
LOCAL master -- the one actions/checkout left at this run's own SHA --
not the ref just fetched. A nightly build takes long enough that master
has usually moved by the time it finishes, so the manifest gets its new
entry prepended to a stale copy and the push is rejected:

    ! [rejected]  master -> master (non-fast-forward)

Run 1045 failed this way, and the log is unambiguous about it: "Your
branch is behind 'origin/master' by 1 commit, and can be fast-forwarded"
appears one line before the commit that could not be pushed.

`checkout -B master origin/master` is the fix, and it is right rather
than merely convenient. This step appends one version entry to the
manifest as it stands on master, so the base it edits has to be master.
Editing the copy this build happened to start from and then forcing it
through would silently drop whatever landed in between.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

dtourolle merged commit 699b5432b9 into master

2026-09-03 18:48:42 +00:00

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: dtourolle/jellyfin-srfPlay#2