2021-06-27 12:10:34 +01:00
# 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.
2021-06-30 23:44:37 +01:00
name : "Periodic Merges (24h)"
2021-06-27 12:10:34 +01:00
on :
schedule :
# * is a special character in YAML so you have to quote this string
2021-07-01 12:16:36 +01:00
# Merge every 24 hours
2021-06-30 23:44:37 +01:00
- cron : '0 0 * * *'
2021-06-27 12:10:34 +01:00
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 : haskell-updates
2021-10-05 19:53:53 +01:00
- from : release-21.05
into : staging-next-21.05
- from : staging-next-21.05
into : staging-21.05
2021-11-21 23:21:47 +00:00
- from : release-21.11
into : staging-next-21.11
- from : staging-next-21.11
into : staging-21.11
2021-06-27 12:10:34 +01:00
name : ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }}
steps :
2022-03-01 23:23:02 +00:00
- uses : actions/checkout@v3
2021-06-27 12:10:34 +01:00
- name : ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }}
2021-08-31 00:14:43 +01:00
uses : devmasx/merge-branch@1.4.0
2021-06-27 12:10:34 +01:00
with :
type : now
from_branch : ${{ matrix.pairs.from }}
target_branch : ${{ matrix.pairs.into }}
github_token : ${{ secrets.GITHUB_TOKEN }}
- name : Comment on failure
2022-03-22 23:27:02 +00:00
uses : peter-evans/create-or-update-comment@v2
2021-06-27 12:10:34 +01:00
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 }}).