Consistently condition merge-dependent workflows #364338
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
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.
github-actions
bot
added
6.topic: policy discussion
6.topic: continuous integration
Closed
github-actions
bot
added
10.rebuild-darwin: 0
nix-owners
bot
requested review from
azuwis,
LeSuisse,
Mic92,
mweinelt,
philiptaron,
risicle and
zowoq
|
Git push to origin failed for release-24.11 with exitcode 1 |
1 task
wolfgangwalther
added a commit
to wolfgangwalther/nixpkgs
that referenced
this pull request
Jan 5, 2025
This has the advantage that get-merge-commit doesn't run up to 10+ times, spamming the checks output of PRs. It comes at the cost of having to add "if: steps.checkout.outputs.done" in more places, but I think we can pay that price for a better output. This effectively reverts parts of NixOS#364338. By integrating the checkout itself into the composite action, we also save some code repetition as well.
wolfgangwalther
added a commit
to wolfgangwalther/nixpkgs
that referenced
this pull request
Jan 5, 2025
Those were left out of NixOS#364338, probably because they were not failing so far. It's unclear to me why that is and I don't think it hurts to use the same action everywhere for consistency.
wolfgangwalther
added a commit
to wolfgangwalther/nixpkgs
that referenced
this pull request
Jan 5, 2025
This has the advantage that get-merge-commit doesn't run up to 10+ times, spamming the checks output of PRs. It comes at the cost of having to add "if: steps.checkout.outputs.done" in more places, but I think we can pay that price for a better output. This effectively reverts parts of NixOS#364338. By integrating the checkout itself into the composite action, we also save some code repetition as well.
wolfgangwalther
added a commit
to wolfgangwalther/nixpkgs
that referenced
this pull request
Jan 5, 2025
Those were left out of NixOS#364338, probably because they were not failing so far. It's unclear to me why that is and I don't think it hurts to use the same action everywhere for consistency.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Before this, PRs with conflicts would cause some workflows to fail (e.g. here), because they tried to fetch the test merge commit, which doesn't exist when there's a conflict.
This PR fixes that by using the reusable
get-merge-commitworkflow introduced in #361494 for all workflows that depend on a successful merge.Furthermore, a second commit also makes all the merge commit conditionals consistent.
Things done
This work is funded by Tweag and Antithesis ✨
Add a 👍 reaction to pull requests you find important.