summary refs log tree commit diff
path: root/.github/workflows/periodic-merge-24h.yml
diff options
context:
space:
mode:
authorMartin Weinelt <hexa@darmstadt.ccc.de>2021-10-05 20:53:53 +0200
committerMartin Weinelt <hexa@darmstadt.ccc.de>2021-10-05 20:53:53 +0200
commit8b77d991b6f478ccbd803870c7708a2266a85c38 (patch)
tree16fab77a334aa57f4bba5689b1d3c8d67c47aafb /.github/workflows/periodic-merge-24h.yml
parent7cbed9e6bdf5020df3115098c8d3ace482a58ca4 (diff)
downloadnixpkgs-8b77d991b6f478ccbd803870c7708a2266a85c38.tar
nixpkgs-8b77d991b6f478ccbd803870c7708a2266a85c38.tar.gz
nixpkgs-8b77d991b6f478ccbd803870c7708a2266a85c38.tar.bz2
nixpkgs-8b77d991b6f478ccbd803870c7708a2266a85c38.tar.lz
nixpkgs-8b77d991b6f478ccbd803870c7708a2266a85c38.tar.xz
nixpkgs-8b77d991b6f478ccbd803870c7708a2266a85c38.tar.zst
nixpkgs-8b77d991b6f478ccbd803870c7708a2266a85c38.zip
.github/workflows/periodic-merge: move stable merges to 24h cycle
Diffstat (limited to '.github/workflows/periodic-merge-24h.yml')
-rw-r--r--.github/workflows/periodic-merge-24h.yml4
1 files changed, 4 insertions, 0 deletions
diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml
index 81c5694f43d..9032b3d7d91 100644
--- a/.github/workflows/periodic-merge-24h.yml
+++ b/.github/workflows/periodic-merge-24h.yml
@@ -28,6 +28,10 @@ jobs:
         pairs:
           - from: master
             into: haskell-updates
+          - from: release-21.05
+            into: staging-next-21.05
+          - from: staging-next-21.05
+            into: staging-21.05
     name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }}
     steps:
       - uses: actions/checkout@v2