From 442a9a811e0b5e4d493be5090ea5ed0cb1e9aa86 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 17 May 2025 14:39:49 +0200
Subject: [PATCH] workflows/periodic-merge: set custom name for haskell-updates
 merge

The simple name can lead to confusion. Adding an explicit override to
make it more clear.

(cherry picked from commit 38169112e8afbf18a6d8b38fbba1b0d8612fcc16)
---
 .github/workflows/periodic-merge-24h.yml | 4 +++-
 .github/workflows/periodic-merge-6h.yml  | 1 +
 .github/workflows/periodic-merge.yml     | 1 -
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml
index 7461992ec5943..60b8bda1eee69 100644
--- a/.github/workflows/periodic-merge-24h.yml
+++ b/.github/workflows/periodic-merge-24h.yml
@@ -35,10 +35,12 @@ jobs:
             into: staging-next-25.05
           - from: staging-next-25.05
             into: staging-25.05
-          - from: master staging
+          - name: merge-base(master,staging) → haskell-updates
+            from: master staging
             into: haskell-updates
     uses: ./.github/workflows/periodic-merge.yml
     with:
       from: ${{ matrix.pairs.from }}
       into: ${{ matrix.pairs.into }}
+    name: ${{ matrix.pairs.name || format('{0} → {1}', matrix.pairs.from, matrix.pairs.into) }}
     secrets: inherit
diff --git a/.github/workflows/periodic-merge-6h.yml b/.github/workflows/periodic-merge-6h.yml
index f7ffec99a4df2..8ec7afa27564a 100644
--- a/.github/workflows/periodic-merge-6h.yml
+++ b/.github/workflows/periodic-merge-6h.yml
@@ -35,4 +35,5 @@ jobs:
     with:
       from: ${{ matrix.pairs.from }}
       into: ${{ matrix.pairs.into }}
+    name: ${{ format('{0} → {1}', matrix.pairs.from, matrix.pairs.into) }}
     secrets: inherit
diff --git a/.github/workflows/periodic-merge.yml b/.github/workflows/periodic-merge.yml
index 2018a4bd94b2f..0f686b2f96e52 100644
--- a/.github/workflows/periodic-merge.yml
+++ b/.github/workflows/periodic-merge.yml
@@ -15,7 +15,6 @@ on:
 jobs:
   merge:
     runs-on: ubuntu-24.04-arm
-    name: ${{ inputs.from }} → ${{ inputs.into }}
     steps:
       # Use a GitHub App to create the PR so that CI gets triggered
       # The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs