Skip to content

ci/github-script/prepare: fix with missing release- branch#462957

Merged
wolfgangwalther merged 1 commit intoNixOS:masterfrom
wolfgangwalther:ci-prepare-25.11
Nov 18, 2025
Merged

ci/github-script/prepare: fix with missing release- branch#462957
wolfgangwalther merged 1 commit intoNixOS:masterfrom
wolfgangwalther:ci-prepare-25.11

Conversation

@wolfgangwalther
Copy link
Contributor

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.

One example of this failing is #462514 (review).

Things done


Add a 👍 reaction to pull requests you find important.

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.
@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 backport release-25.05 labels Nov 18, 2025
@wolfgangwalther wolfgangwalther added this pull request to the merge queue Nov 18, 2025
Merged via the queue into NixOS:master with commit 86204dd Nov 18, 2025
29 of 33 checks passed
@wolfgangwalther wolfgangwalther deleted the ci-prepare-25.11 branch November 18, 2025 18:15
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Nov 18, 2025

Successfully created backport PR for release-25.05:

@github-actions github-actions bot added the 8.has: port to stable This PR already has a backport to the stable release. label Nov 18, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: continuous integration Affects continuous integration (CI) in Nixpkgs, including Ofborg and GitHub Actions 8.has: port to stable This PR already has a backport to the stable release. 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