2021-06-27 11:10:34 +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.
2021-06-30 22:44:37 +00:00
name : "Periodic Merges (6h)"
2021-06-27 11:10:34 +00:00
on :
schedule :
# * is a special character in YAML so you have to quote this string
# Merge every 6 hours
- cron : '0 */6 * * *'
2023-12-02 18:47:53 +00:00
workflow_dispatch :
2021-06-27 11:10:34 +00:00
2022-07-08 17:53:38 +00:00
permissions :
contents : read
2021-06-27 11:10:34 +00:00
jobs :
periodic-merge :
2022-07-08 17:53:38 +00:00
permissions :
contents : write # for devmasx/merge-branch to merge branches
2022-09-11 07:01:47 +00:00
pull-requests : write # for peter-evans/create-or-update-comment to create or update comment
2021-06-27 11:10:34 +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 :
2024-09-30 12:02:46 +00:00
- uses : actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
2021-06-27 11:10:34 +00:00
- name : ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }}
2023-11-28 03:28:58 +00:00
uses : devmasx/merge-branch@854d3ac71ed1e9deb668e0074781b81fdd6e771f # 1.4.0
2021-06-27 11:10:34 +00:00
with :
type : now
from_branch : ${{ matrix.pairs.from }}
target_branch : ${{ matrix.pairs.into }}
github_token : ${{ secrets.GITHUB_TOKEN }}
- name : Comment on failure
2024-01-29 11:48:14 +00:00
uses : peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
2021-06-27 11:10:34 +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 }}).