Skip to content

[release-24.11] Consistently condition merge-dependent workflows#365673

Merged
infinisil merged 2 commits intoNixOS:release-24.11from
tweag:backport-364338
Dec 16, 2024
Merged

[release-24.11] Consistently condition merge-dependent workflows#365673
infinisil merged 2 commits intoNixOS:release-24.11from
tweag:backport-364338

Conversation

@infinisil
Copy link
Member

Manual backport of #364338

Prevents such failures on release-24.11: https://github.com/NixOS/nixpkgs/actions/runs/12359159471/job/34491259676

Ping @FliegendeWurst @wolfgangwalther

Things done

  • Confirmed that it works fine on master and there's nothing substantially different on release-24.11

Add a 👍 reaction to pull requests you find important.

After the introduction of the reusable get-merge-commit.yml workflow,
this now applies it on all remaining workflows that depend on a merge
commit. This ensures that CI doesn't fail for those PRs, which would
cause notifications to be sent, and the CI run to be marked as failed in
the list of runs.

(cherry picked from commit 83d4c9d)
Before the get-merge-commit was put into a separate workflow job, it ran
as a step, which then required skipping all subsequent steps
individually. This is not necessary anymore, because entire workflow
jobs can be skipped.

This commit consistently applies that change throughout all workflows.

(cherry picked from commit 4e6b563)
@github-actions github-actions bot added 6.topic: policy discussion Discuss policies to work in and around Nixpkgs 6.topic: continuous integration Affects continuous integration (CI) in Nixpkgs, including Ofborg and GitHub Actions labels Dec 16, 2024
@infinisil infinisil changed the title Backport 364338 [release-24.11] Consistently condition merge-dependent workflows Dec 16, 2024
@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. labels Dec 16, 2024
Copy link
Contributor

@wolfgangwalther wolfgangwalther left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!

@infinisil infinisil merged commit 5ef28e2 into NixOS:release-24.11 Dec 16, 2024
@infinisil infinisil deleted the backport-364338 branch December 16, 2024 21:03
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 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.

2 participants