5 commits

Author	SHA1	Message	Date
Martin Weinelt	8b77d991b6	.github/workflows/periodic-merge: move stable merges to 24h cycle	2021-10-05 20:53:53 +02:00
dependabot[bot]	05a5144fa9	build(deps): bump devmasx/merge-branch from 1.3.1 to 1.4.0 ... Bumps [devmasx/merge-branch](https://github.com/devmasx/merge-branch) from 1.3.1 to 1.4.0. - [Release notes](https://github.com/devmasx/merge-branch/releases) - [Changelog](https://github.com/devmasx/merge-branch/blob/master/CHANGELOG.md) - [Commits](https://github.com/devmasx/merge-branch/compare/v1.3.1...1.4.0) --- updated-dependencies: - dependency-name: devmasx/merge-branch dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2021-09-02 07:08:00 +10:00
Dennis Gosnell	4b16b8c76b	workflows: fix documentation for periodic 24 hours merge	2021-07-01 20:16:36 +09:00
Malte Brandy	4acf281f00	.github/workflows/periodic-merge-*: Tiny improvements	2021-07-01 00:44:37 +02:00
Martin Weinelt	3f40ca48bc	.github/workflows/periodic-merge: generalize from merge-staging ... By generalizing the previous merge-staging action we can support a large number of branch pairs that need to be merged periodically. Provide two intervals, daily and every six hours, to accomodate different needs. Co-Authored-By: Malte Brandy <malte.brandy@maralorn.de>	2021-06-30 22:42:16 +02:00