summary refs log tree commit diff
path: root/.github/workflows/periodic-merge-6h.yml
Commit message (Collapse)AuthorAge
* build(deps): bump actions/checkout from 2 to 3dependabot[bot]2022-03-02
| | | | | | | Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2...v3)
* .github/workflows/periodic-merge: move stable merges to 24h cycleMartin Weinelt2021-10-05
|
* build(deps): bump devmasx/merge-branch from 1.3.1 to 1.4.0dependabot[bot]2021-09-02
| | | | | | | | | | | | | | | 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>
* .github/workflows/periodic-merge-*: Tiny improvementsMalte Brandy2021-07-01
|
* .github/workflows/periodic-merge: generalize from merge-stagingMartin Weinelt2021-06-30
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>