180dada3ed
Bumps [peter-evans/create-or-update-comment](https://github.com/peter-evans/create-or-update-comment) from 1 to 2. - [Release notes](https://github.com/peter-evans/create-or-update-comment/releases) - [Commits](https://github.com/peter-evans/create-or-update-comment/compare/v1...v2) --- updated-dependencies: - dependency-name: peter-evans/create-or-update-comment dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
52 lines
1.7 KiB
YAML
52 lines
1.7 KiB
YAML
# This action periodically merges base branches into staging branches.
|
||
# This is done to
|
||
# * prevent conflicts or rather resolve them early
|
||
# * make all potential breakage happen on the staging branch
|
||
# * and make sure that all major rebuilds happen before the staging
|
||
# branch get’s merged back into its base branch.
|
||
|
||
name: "Periodic Merges (6h)"
|
||
|
||
|
||
on:
|
||
schedule:
|
||
# * is a special character in YAML so you have to quote this string
|
||
# Merge every 6 hours
|
||
- cron: '0 */6 * * *'
|
||
|
||
jobs:
|
||
periodic-merge:
|
||
if: github.repository_owner == 'NixOS'
|
||
runs-on: ubuntu-latest
|
||
strategy:
|
||
# don't fail fast, so that all pairs are tried
|
||
fail-fast: false
|
||
# certain branches need to be merged in order, like master->staging-next->staging
|
||
# and disabling parallelism ensures the order of the pairs below.
|
||
max-parallel: 1
|
||
matrix:
|
||
pairs:
|
||
- from: master
|
||
into: staging-next
|
||
- from: staging-next
|
||
into: staging
|
||
name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }}
|
||
steps:
|
||
- uses: actions/checkout@v3
|
||
|
||
- name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }}
|
||
uses: devmasx/merge-branch@1.4.0
|
||
with:
|
||
type: now
|
||
from_branch: ${{ matrix.pairs.from }}
|
||
target_branch: ${{ matrix.pairs.into }}
|
||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||
|
||
- name: Comment on failure
|
||
uses: peter-evans/create-or-update-comment@v2
|
||
if: ${{ failure() }}
|
||
with:
|
||
issue-number: 105153
|
||
body: |
|
||
Periodic merge from `${{ matrix.pairs.from }}` into `${{ matrix.pairs.into }}` has [failed](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}).
|