From 86de96dbc1a8e65bc5f02b98d708315c0ec0fc02 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Tue, 13 May 2025 17:32:39 +0200 Subject: [PATCH] workflows/periodic-merges: integrate with staging-25.05 For now this uses master as root before branch-off. --- .github/workflows/periodic-merge-24h.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml index 9090eb17a965..7461992ec594 100644 --- a/.github/workflows/periodic-merge-24h.yml +++ b/.github/workflows/periodic-merge-24h.yml @@ -31,6 +31,10 @@ jobs: into: staging-next-24.11 - from: staging-next-24.11 into: staging-24.11 + - from: master + into: staging-next-25.05 + - from: staging-next-25.05 + into: staging-25.05 - from: master staging into: haskell-updates uses: ./.github/workflows/periodic-merge.yml