[Backport release-24.11] workflows: small refactors #372939
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
This seems to be unused. It can be triggered manually, but is this really done? Is this superseded by the new eval checks or should we instead run this regularly? (cherry picked from commit aa7335c)
(cherry picked from commit 4d00c68)
All other workflows do - and most importantly actionlint only runs on .yml files! (cherry picked from commit fcb24b9)
mergedSha is available from needs.get-merge-commit, not needs.attrs. Actionlint rightfully complains about that. The code still works as expected because nixpkgs/ is checked out at mergedSha, so the diff will be between mergedSha and baseSha. (cherry picked from commit 72fd375)
Same top-level ordering of keys / empty lines and same indentation for yaml lists. One blank line between each step. Makes it easier to read and compare the workflows. (cherry picked from commit 88afad8)
The eval-aliases job is independent of attrs already. (cherry picked from commit 94c4c7b)
No need for that limitation, which only artifically limits test-ability of CI in forks. Some other workflows like backports, cherry-pick checks and periodic merges are very specific to the release branches and don't need to be run in forks. (cherry picked from commit b64d5e1)
It seems odd to exclude PRs against release branches for those checks - especially when not excluding PRs against staging-** variants at the same time. (cherry picked from commit 58f8c53)
We currently use two different "base" commits, but the same name. One of them is the commit in which context the pull_request_target runs. The other is the parent of the merge commit. Those are **not** necessarily the same - see README introduced in the next commit for details. Renaming one of them for clarity. Since the pull_request_target related base commit is also called like that in GitHub Actions terminology, we rename the other. The best I could come up with is "target". (cherry picked from commit 3e9f5c0)
This introduces some basic concepts used in these workflows and a common terminology. At the same time we remove some of the comments from various workflow files, because they are assumed to be "general knowledge" through the README. (cherry picked from commit 9ea7422)
13 tasks
|
Confirmed the cherry-pick diff is only about periodic-merge. |
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.
Manual backport of #371216. I left out the two commits touching only the periodic-merge workflow, because this is a scheduled workflow running only from the master branch anyway.
With this, we don't have any diff between the workflow files on master and release-24.11 right now, except for the periodic-merge ofc.