9f95c2ace2
See https://github.com/NixOS/nixpkgs/issues/437208#issuecomment-3288623669 Depends on https://github.com/NixOS/org/pull/172 As documented below, the idea is to essentially group all changes rebuilding all VM tests with kernel updates and merge them together into `master` whenever the Linux kernels get updated. This documents the workflow of updates in the nixpkgs manual. While at it, I removed the README from the packages because * it's horribly outdated * I didn't even know it exists which confirms that its discoverability was very poor and added the relevant portions into the nixpkgs manual as well.
46 lines
1.3 KiB
YAML
46 lines
1.3 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 * * *'
|
||
workflow_dispatch:
|
||
|
||
permissions: {}
|
||
|
||
defaults:
|
||
run:
|
||
shell: bash
|
||
|
||
jobs:
|
||
periodic-merge:
|
||
if: github.repository_owner == 'NixOS'
|
||
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
|
||
- from: master
|
||
into: staging-nixos
|
||
uses: ./.github/workflows/periodic-merge.yml
|
||
with:
|
||
from: ${{ matrix.pairs.from }}
|
||
into: ${{ matrix.pairs.into }}
|
||
name: ${{ format('{0} → {1}', matrix.pairs.from, matrix.pairs.into) }}
|
||
secrets: inherit
|