Skip to content

[Backport release-25.05] workflows/pr: preparation for required status checks#418400

Merged
wolfgangwalther merged 5 commits intorelease-25.05from
backport-417957-to-release-25.05
Jun 20, 2025
Merged

[Backport release-25.05] workflows/pr: preparation for required status checks#418400
wolfgangwalther merged 5 commits intorelease-25.05from
backport-417957-to-release-25.05

Conversation

@nixpkgs-ci
Copy link
Contributor

@nixpkgs-ci nixpkgs-ci bot commented Jun 20, 2025

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

  • 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.

Some naming improvements after we introduced the PR / Push workflows and
small refactors.

(cherry picked from commit 69ab2f4)
This is only a refactor at this stage, but split into a separate commit
for better review. It's the base for the next two commits.

(cherry picked from commit 9422f30)
This fixes a problem where each workflow would get their own merge
commit. This happens frequently when the target branch is merged into a
the same time, different workflows in the same run will run
get-merge-commit at different times and thus have different merge
commits.

Since the jobs don't really depend on each other, this doesn't cause
practical problems, yet. But it has already led to strange CI failures
in a still unmerged PR, which can be prevented from happening with this
clean approach.

And yes, this saves a few API calls on every run.

(cherry picked from commit 09ddb1a)
This allows *not* depending on those two jobs with the required status
checks in the next commit, which wouldn't really make sense. If labeling
or pinging maintainers fails for obscure reasons or because the GitHub
API is down, a PR might still pass all other tests and be
merge-eligible.

(cherry picked from commit 9927d75)
This job serves as a target for the "Required Status Checks" branch
protection rule.

(cherry picked from commit caf4ced)
@github-actions github-actions 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 6.topic: policy discussion Discuss policies to work in and around Nixpkgs labels Jun 20, 2025
@wolfgangwalther wolfgangwalther merged commit a6e9521 into release-25.05 Jun 20, 2025
50 of 52 checks passed
@wolfgangwalther wolfgangwalther deleted the backport-417957-to-release-25.05 branch June 20, 2025 11:17
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 6.topic: policy discussion Discuss policies to work in and around Nixpkgs 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