Skip to content

[Backport release-25.05] ci/github-script/prepare: fix with missing release- branch#462959

Merged
wolfgangwalther merged 1 commit intorelease-25.05from
backport-462957-to-release-25.05
Nov 18, 2025
Merged

[Backport release-25.05] ci/github-script/prepare: fix with missing release- branch#462959
wolfgangwalther merged 1 commit intorelease-25.05from
backport-462957-to-release-25.05

Conversation

@nixpkgs-ci
Copy link
Contributor

@nixpkgs-ci nixpkgs-ci bot commented Nov 18, 2025

Bot-based backport to release-25.05, triggered by a label in #462957.

Before merging, ensure that this backport is acceptable for the release.

Even as a non-committer, if you find that it is not acceptable, leave a comment.

The prepare script is currently failing for staging-25.11 PR's, because
it assumes that a release-25.11 exists respectively. This is not the
case in the transition phase before branch-off.

We can fix this by always including the current target branch in the
branches to check for, even if it's not a WIP branch. This means we
might check some branches twice, but that's better than erroring out
entirely when the branch is in fact correct.

(cherry picked from commit 4cb689f)
@wolfgangwalther wolfgangwalther added this pull request to the merge queue Nov 18, 2025
@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. 6.topic: continuous integration Affects continuous integration (CI) in Nixpkgs, including Ofborg and GitHub Actions 4.workflow: backport This targets a stable branch labels Nov 18, 2025
Merged via the queue into release-25.05 with commit 76bbc66 Nov 18, 2025
29 of 33 checks passed
@wolfgangwalther wolfgangwalther deleted the backport-462957-to-release-25.05 branch November 18, 2025 18:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4.workflow: backport This targets a stable branch 6.topic: continuous integration Affects continuous integration (CI) in Nixpkgs, including Ofborg and GitHub Actions 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant