about summary refs log tree commit diff
path: root/.github/workflows/periodic-merge-24h.yml
diff options
context:
space:
mode:
Diffstat (limited to '.github/workflows/periodic-merge-24h.yml')
-rw-r--r--.github/workflows/periodic-merge-24h.yml6
1 files changed, 5 insertions, 1 deletions
diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml
index d9ad593618aea..261a2cdba45dc 100644
--- a/.github/workflows/periodic-merge-24h.yml
+++ b/.github/workflows/periodic-merge-24h.yml
@@ -39,9 +39,13 @@ jobs:
             into: staging-next-23.11
           - from: staging-next-23.11
             into: staging-23.11
+          - from: release-24.05
+            into: staging-next-24.05
+          - from: staging-next-24.05
+            into: staging-24.05
     name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }}
     steps:
-      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+      - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
 
       - name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }}
         uses: devmasx/merge-branch@854d3ac71ed1e9deb668e0074781b81fdd6e771f # 1.4.0