From 6c63b5fe36ec6f91525d93c3a1c8a2e5450ea0e4 Mon Sep 17 00:00:00 2001
From: Oliver Hader <oliver.hader@typo3.org>
Date: Wed, 4 Mar 2026 12:17:46 +0100
Subject: [PATCH 1/2] [TASK] Simplify ci.yml workflow dispatcher

- omits having to use GH_TOKEN environment
- omits having to invoke the `gh` CLI
---
 .github/workflows/ci.yml           | 13 +++++++++++--
 .github/workflows/nightly-8.yml    | 17 +++--------------
 .github/workflows/nightly-main.yml | 15 +--------------
 3 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 21f8d5f4..35d827b1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,6 +4,15 @@ on:
   push:
   pull_request:
   workflow_dispatch:
+  workflow_call:
+    inputs:
+      ref:
+        required: false
+        type: string
+        default: ''
+
+permissions:
+  contents: read
 
 jobs:
 
@@ -15,10 +24,10 @@ jobs:
         php: [ '8.2', '8.3', '8.4', '8.5' ]
     steps:
 
-      - name: Checkout ${{ github.event_name == 'workflow_dispatch' && github.head_ref || '' }}
+      - name: Checkout ${{ inputs.ref || '' }}
         uses: actions/checkout@v4
         with:
-          ref: ${{ github.event_name == 'workflow_dispatch' && github.head_ref || '' }}
+          ref: ${{ inputs.ref || '' }}
 
       - name: Composer install
         run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -s composerUpdate
diff --git a/.github/workflows/nightly-8.yml b/.github/workflows/nightly-8.yml
index 622a5f05..a2d01901 100644
--- a/.github/workflows/nightly-8.yml
+++ b/.github/workflows/nightly-8.yml
@@ -8,17 +8,6 @@ on:
 jobs:
     nightly-8:
         name: "dispatch-nightly-8"
-        runs-on: ubuntu-22.04
-        permissions:
-            actions: write
-        steps:
-            - name: Checkout '8'
-              uses: actions/checkout@v4
-              with:
-                  ref: '8'
-
-            - name: Execute 'ci.yml' on '8'
-              env:
-                  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-              run: |
-                  gh workflow run ci.yml --ref 8
+        uses: ./.github/workflows/ci.yml
+        with:
+            ref: '8'
diff --git a/.github/workflows/nightly-main.yml b/.github/workflows/nightly-main.yml
index f433d2ac..5dec2e30 100644
--- a/.github/workflows/nightly-main.yml
+++ b/.github/workflows/nightly-main.yml
@@ -8,17 +8,4 @@ on:
 jobs:
     nightly-main:
         name: "dispatch-nightly-main"
-        runs-on: ubuntu-22.04
-        permissions:
-            actions: write
-        steps:
-            - name: Checkout 'main'
-              uses: actions/checkout@v4
-              with:
-                  ref: 'main'
-
-            - name: Execute 'ci.yml' on 'main'
-              env:
-                  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-              run: |
-                  gh workflow run ci.yml --ref main
+        uses: ./.github/workflows/ci.yml

From 0a26509dc12c4b12ae805606927f5735de74346d Mon Sep 17 00:00:00 2001
From: Oliver Hader <oliver.hader@typo3.org>
Date: Wed, 4 Mar 2026 12:24:45 +0100
Subject: [PATCH 2/2] [TASK] Explicitly trigger main branch in nighty action

---
 .github/workflows/nightly-main.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/nightly-main.yml b/.github/workflows/nightly-main.yml
index 5dec2e30..ca9766fe 100644
--- a/.github/workflows/nightly-main.yml
+++ b/.github/workflows/nightly-main.yml
@@ -9,3 +9,5 @@ jobs:
     nightly-main:
         name: "dispatch-nightly-main"
         uses: ./.github/workflows/ci.yml
+        with:
+            ref: 'main'
\ No newline at end of file