From 6337d1c7e062f0fa78af0cfbc6e5e3bd6f0f708f Mon Sep 17 00:00:00 2001
From: Thomas Segismont <tsegismont@gmail.com>
Date: Thu, 5 Mar 2026 10:35:49 +0100
Subject: [PATCH 1/2] Split CI workflow to prevent schedule inactivity from
 pausing push/PR builds

See https://github.com/vert-x3/issues/issues/665

Signed-off-by: Thomas Segismont <tsegismont@gmail.com>
---
 .github/workflows/ci-5.x-stable.yml                |  4 +---
 .github/workflows/ci-5.x.yml                       |  2 --
 .github/workflows/{ci-4.x.yml => schedule-4.x.yml} |  0
 .github/workflows/schedule-5.x-stable.yml          | 10 ++++++++++
 .github/workflows/schedule-5.x.yml                 | 10 ++++++++++
 5 files changed, 21 insertions(+), 5 deletions(-)
 rename .github/workflows/{ci-4.x.yml => schedule-4.x.yml} (100%)
 create mode 100644 .github/workflows/schedule-5.x-stable.yml
 create mode 100644 .github/workflows/schedule-5.x.yml

diff --git a/.github/workflows/ci-5.x-stable.yml b/.github/workflows/ci-5.x-stable.yml
index 4fc9e7f252..8f6ff86aec 100644
--- a/.github/workflows/ci-5.x-stable.yml
+++ b/.github/workflows/ci-5.x-stable.yml
@@ -6,11 +6,9 @@ on:
   pull_request:
     branches:
       - '5.[0-9]+'
-  schedule:
-    - cron: '0 6 * * *'
 jobs:
   CI-CD:
     uses: ./.github/workflows/ci-matrix-5.x.yml
     secrets: inherit
     with:
-      branch: ${{ github.event_name == 'schedule' && vars.VERTX_5_STABLE_BRANCH || github.event.pull_request.head.sha || github.ref_name }}
+      branch: ${{ github.event.pull_request.head.sha || github.ref_name }}
diff --git a/.github/workflows/ci-5.x.yml b/.github/workflows/ci-5.x.yml
index 3cecb6fe8d..56fd248a5d 100644
--- a/.github/workflows/ci-5.x.yml
+++ b/.github/workflows/ci-5.x.yml
@@ -6,8 +6,6 @@ on:
   pull_request:
     branches:
       - master
-  schedule:
-    - cron: '0 5 * * *'
 jobs:
   CI-CD:
     uses: ./.github/workflows/ci-matrix-5.x.yml
diff --git a/.github/workflows/ci-4.x.yml b/.github/workflows/schedule-4.x.yml
similarity index 100%
rename from .github/workflows/ci-4.x.yml
rename to .github/workflows/schedule-4.x.yml
diff --git a/.github/workflows/schedule-5.x-stable.yml b/.github/workflows/schedule-5.x-stable.yml
new file mode 100644
index 0000000000..584aca87a1
--- /dev/null
+++ b/.github/workflows/schedule-5.x-stable.yml
@@ -0,0 +1,10 @@
+name: vertx-sql-client (5.x-stable)
+on:
+  schedule:
+    - cron: '0 6 * * *'
+jobs:
+  CI-CD:
+    uses: ./.github/workflows/ci-matrix-5.x.yml
+    secrets: inherit
+    with:
+      branch: ${{ github.event_name == 'schedule' && vars.VERTX_5_STABLE_BRANCH || github.ref_name }}
diff --git a/.github/workflows/schedule-5.x.yml b/.github/workflows/schedule-5.x.yml
new file mode 100644
index 0000000000..c1a35913e1
--- /dev/null
+++ b/.github/workflows/schedule-5.x.yml
@@ -0,0 +1,10 @@
+name: vertx-sql-client (5.x)
+on:
+  schedule:
+    - cron: '0 5 * * *'
+jobs:
+  CI-CD:
+    uses: ./.github/workflows/ci-matrix-5.x.yml
+    secrets: inherit
+    with:
+      branch: ${{ github.ref_name }}

From 4b3b786e78d59fb318e696e4ace01ab124e5f014 Mon Sep 17 00:00:00 2001
From: Thomas Segismont <tsegismont@gmail.com>
Date: Thu, 5 Mar 2026 17:09:02 +0100
Subject: [PATCH 2/2] Keep a single ci-5.x.yml file

For CI builds triggered by pushes to supported branches or pull requests, we can have a single file that lists the branches.

Signed-off-by: Thomas Segismont <tsegismont@gmail.com>
---
 .github/workflows/ci-5.x-stable.yml | 14 --------------
 .github/workflows/ci-5.x.yml        |  2 ++
 2 files changed, 2 insertions(+), 14 deletions(-)
 delete mode 100644 .github/workflows/ci-5.x-stable.yml

diff --git a/.github/workflows/ci-5.x-stable.yml b/.github/workflows/ci-5.x-stable.yml
deleted file mode 100644
index 8f6ff86aec..0000000000
--- a/.github/workflows/ci-5.x-stable.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: vertx-sql-client (5.x-stable)
-on:
-  push:
-    branches:
-      - '5.[0-9]+'
-  pull_request:
-    branches:
-      - '5.[0-9]+'
-jobs:
-  CI-CD:
-    uses: ./.github/workflows/ci-matrix-5.x.yml
-    secrets: inherit
-    with:
-      branch: ${{ github.event.pull_request.head.sha || github.ref_name }}
diff --git a/.github/workflows/ci-5.x.yml b/.github/workflows/ci-5.x.yml
index 56fd248a5d..fdf920808e 100644
--- a/.github/workflows/ci-5.x.yml
+++ b/.github/workflows/ci-5.x.yml
@@ -3,9 +3,11 @@ on:
   push:
     branches:
       - master
+      - '5.[0-9]+'
   pull_request:
     branches:
       - master
+      - '5.[0-9]+'
 jobs:
   CI-CD:
     uses: ./.github/workflows/ci-matrix-5.x.yml