2021-07-03 03:11:41 +00: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.
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 * * *'
2022-07-14 12:49:19 +00:00
permissions :
contents : read
2021-07-03 03:11:41 +00:00
jobs :
periodic-merge :
2022-07-14 12:49:19 +00:00
permissions :
contents : write # for devmasx/merge-branch to merge branches
2022-09-14 18:05:37 +00:00
pull-requests : write # for peter-evans/create-or-update-comment to create or update comment
2021-07-03 03:11:41 +00:00
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 :
2022-03-05 16:20:37 +00:00
- uses : actions/checkout@v3
2021-07-03 03:11:41 +00:00
- name : ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }}
2021-09-18 10:52:07 +00:00
uses : devmasx/merge-branch@1.4.0
2021-07-03 03:11:41 +00: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-30 09:31:56 +00:00
uses : peter-evans/create-or-update-comment@v2
2021-07-03 03:11:41 +00: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 }}).