From f147e15871c99d36c20a5c6cf22827a9e00af516 Mon Sep 17 00:00:00 2001
From: Thomas Segismont <tsegismont@gmail.com>
Date: Tue, 24 Mar 2026 16:14:39 +0100
Subject: [PATCH 1/2] Revert "Rename scheduled jobs (#1637)"

This reverts commit 3fe39b4ebb3238ee4f4a16147d604fe0f4f09f62.
---
 .github/workflows/schedule-4.x.yml        | 2 +-
 .github/workflows/schedule-5.x-stable.yml | 2 +-
 .github/workflows/schedule-5.x.yml        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/schedule-4.x.yml b/.github/workflows/schedule-4.x.yml
index 73dbff5aa..2a079cb6f 100644
--- a/.github/workflows/schedule-4.x.yml
+++ b/.github/workflows/schedule-4.x.yml
@@ -1,4 +1,4 @@
-name: vertx-sql-client nightly (4.x)
+name: vertx-sql-client (4.x)
 on:
   schedule:
     - cron: '0 4 * * *'
diff --git a/.github/workflows/schedule-5.x-stable.yml b/.github/workflows/schedule-5.x-stable.yml
index fb9a7e980..584aca87a 100644
--- a/.github/workflows/schedule-5.x-stable.yml
+++ b/.github/workflows/schedule-5.x-stable.yml
@@ -1,4 +1,4 @@
-name: vertx-sql-client nightly (5.x-stable)
+name: vertx-sql-client (5.x-stable)
 on:
   schedule:
     - cron: '0 6 * * *'
diff --git a/.github/workflows/schedule-5.x.yml b/.github/workflows/schedule-5.x.yml
index 785177017..c1a35913e 100644
--- a/.github/workflows/schedule-5.x.yml
+++ b/.github/workflows/schedule-5.x.yml
@@ -1,4 +1,4 @@
-name: vertx-sql-client nightly (5.x)
+name: vertx-sql-client (5.x)
 on:
   schedule:
     - cron: '0 5 * * *'

From d35354957c1264adbac6a90ca334d80a76a8b520 Mon Sep 17 00:00:00 2001
From: Thomas Segismont <tsegismont@gmail.com>
Date: Tue, 24 Mar 2026 16:14:39 +0100
Subject: [PATCH 2/2] Revert "Split CI workflow to prevent schedule inactivity
 from pausing push/PR builds (#1629)"

This reverts commit 900cc1f86bb86d8935c13a01988911db32d01303.
---
 .github/workflows/{schedule-4.x.yml => ci-4.x.yml}     |  0
 .../{schedule-5.x-stable.yml => ci-5.x-stable.yml}     |  8 +++++++-
 .github/workflows/ci-5.x.yml                           |  4 ++--
 .github/workflows/schedule-5.x.yml                     | 10 ----------
 4 files changed, 9 insertions(+), 13 deletions(-)
 rename .github/workflows/{schedule-4.x.yml => ci-4.x.yml} (100%)
 rename .github/workflows/{schedule-5.x-stable.yml => ci-5.x-stable.yml} (58%)
 delete mode 100644 .github/workflows/schedule-5.x.yml

diff --git a/.github/workflows/schedule-4.x.yml b/.github/workflows/ci-4.x.yml
similarity index 100%
rename from .github/workflows/schedule-4.x.yml
rename to .github/workflows/ci-4.x.yml
diff --git a/.github/workflows/schedule-5.x-stable.yml b/.github/workflows/ci-5.x-stable.yml
similarity index 58%
rename from .github/workflows/schedule-5.x-stable.yml
rename to .github/workflows/ci-5.x-stable.yml
index 584aca87a..4fc9e7f25 100644
--- a/.github/workflows/schedule-5.x-stable.yml
+++ b/.github/workflows/ci-5.x-stable.yml
@@ -1,5 +1,11 @@
 name: vertx-sql-client (5.x-stable)
 on:
+  push:
+    branches:
+      - '5.[0-9]+'
+  pull_request:
+    branches:
+      - '5.[0-9]+'
   schedule:
     - cron: '0 6 * * *'
 jobs:
@@ -7,4 +13,4 @@ jobs:
     uses: ./.github/workflows/ci-matrix-5.x.yml
     secrets: inherit
     with:
-      branch: ${{ github.event_name == 'schedule' && vars.VERTX_5_STABLE_BRANCH || github.ref_name }}
+      branch: ${{ github.event_name == 'schedule' && vars.VERTX_5_STABLE_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 fdf920808..3cecb6fe8 100644
--- a/.github/workflows/ci-5.x.yml
+++ b/.github/workflows/ci-5.x.yml
@@ -3,11 +3,11 @@ on:
   push:
     branches:
       - master
-      - '5.[0-9]+'
   pull_request:
     branches:
       - master
-      - '5.[0-9]+'
+  schedule:
+    - cron: '0 5 * * *'
 jobs:
   CI-CD:
     uses: ./.github/workflows/ci-matrix-5.x.yml
diff --git a/.github/workflows/schedule-5.x.yml b/.github/workflows/schedule-5.x.yml
deleted file mode 100644
index c1a35913e..000000000
--- a/.github/workflows/schedule-5.x.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-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 }}