diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-27 15:48:27 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-28 13:44:18 +0100 |
| commit | 24884e5aac7c095ec2c8a895f8825a3f675088ec (patch) | |
| tree | 5c62fd97b1c1d41645d1c330caf3e81a501c5be7 /.github/CODEOWNERS | |
| parent | be36f6f0a0ffbeef228a021f5a343f5ce7a183de (diff) | |
| download | nixpkgs-24884e5aac7c095ec2c8a895f8825a3f675088ec.tar nixpkgs-24884e5aac7c095ec2c8a895f8825a3f675088ec.tar.gz nixpkgs-24884e5aac7c095ec2c8a895f8825a3f675088ec.tar.bz2 nixpkgs-24884e5aac7c095ec2c8a895f8825a3f675088ec.tar.lz nixpkgs-24884e5aac7c095ec2c8a895f8825a3f675088ec.tar.xz nixpkgs-24884e5aac7c095ec2c8a895f8825a3f675088ec.tar.zst nixpkgs-24884e5aac7c095ec2c8a895f8825a3f675088ec.zip | |
GH Action: merge staging(-next) periodically
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.
Diffstat (limited to '.github/CODEOWNERS')
| -rw-r--r-- | .github/CODEOWNERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 20668760d2d..9835b765461 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -12,6 +12,7 @@ # GitHub actions /.github/workflows @Mic92 @zowoq +/.github/workflows/merge-staging @FRidh # EditorConfig /.editorconfig @Mic92 @zowoq |