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.
2020-11-28 13:44:18 +01:00
parent be36f6f0a0
commit 24884e5aac
2 changed files with 31 additions and 0 deletions
@@ -12,6 +12,7 @@

 # GitHub actions
 /.github/workflows @Mic92 @zowoq
+/.github/workflows/merge-staging @FRidh

 # EditorConfig
 /.editorconfig @Mic92 @zowoq