If I receive the mail notification that staging(-next) merge failed,
I either need to check `git log staging-next` or click the action run link
to find out where should I resolve the conflict.
To save time, let’s include the information about which step failed right in the comment.
release-haskell.nix is intended to be a replacement for
https://github.com/peti/ci/blob/master/haskell-nixpkgs.nix
which is currently the main expression for the haskell-updates jobset
on hydra (in the nixpkgs project).
It has the same jobs as the old haskell-nixpkgs.nix file:
* haskellPackages.*
* haskell.compiler.*
* Some extra haskell packages for certain compilers
The following jobs are new:
* tests.haskell.*
* A manually maintained list of top-level haskell packages (most of them
using justStaticExecutables)
* An aggregate job which is intended to aid merging the haskell-updates
branch: It holds an arbitrary list of haskell-related packages and
tests we intend have working at all times. This is still somewhat
incomplete and should be extendend in the future.
Additionally a lot of refactoring has been done and some unnecessary
code has been eliminated. Due to the increased set of jobs and my
ideas of convenience however, the code size has grown overall.
I've tried document the individual parts and would be happy about
feedback in general.
One future improvement could be making adding top-level haskell packages
more convenient and adding them all to the aggregate job automatically.
It's been at least a year since I kept up to date with Ruby, and I
don't think I really have anything left to offer Nixpkgs in terms of
Ruby expertise.
- Error if the commenter doesn't have write access or maintainers can't edit the PR branch.
- Close and comment on PR after rebase so that actions are run when it's reopened.
This doesn't happen currently as we're using the default github token which isn't allowed to trigger other actions.
- Disallow unwanted rebases.
e.g. invalid branches, redundant rebases or rebasing permanent branches onto permanent branches.
I really hate the very concept of this file (the reason being that I
think "owner" implies some form of BDFL rather than just being
notified), but since there were recent[1] changes[2] in auto-patchelf.sh
which I missed it's probably a good idea to add myself there solely for
being notified, because ofborg can't seem to infer maintainer
information here.
To make indentation consistent with all the other entries in the
codeowners file, I also re-indented the other entries in the "Nixpkgs
Internals" block.
[1]: https://github.com/NixOS/nixpkgs/pull/101142
[2]: https://github.com/NixOS/nixpkgs/pull/106830
Signed-off-by: aszlig <aszlig@nix.build>
Automate the merging of `master` -> `staging-next` -> `staging`.
Our main development branch is `master`. Large rebuilds go to `staging`.
Periodically, `staging` is merged into `staging-next` for stabilization.
When considered sufficiently stable, `staging-next` is merged into
`master`.
As changes arrive on these branches, it is important that they're all
updated regularly with eachothers changes. This commit automates that
part.
