Skip to content

Commit 72ed6a1

Browse files
authored
Revert split CI changes (#1639)
* Revert "Rename scheduled jobs (#1637)" This reverts commit 3fe39b4. * Revert "Split CI workflow to prevent schedule inactivity from pausing push/PR builds (#1629)" This reverts commit 900cc1f.
1 parent 3fe39b4 commit 72ed6a1

5 files changed

Lines changed: 19 additions & 23 deletions

File tree

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: vertx-sql-client nightly (4.x)
1+
name: vertx-sql-client (4.x)
22
on:
33
schedule:
44
- cron: '0 4 * * *'
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: vertx-sql-client (5.x-stable)
2+
on:
3+
push:
4+
branches:
5+
- '5.[0-9]+'
6+
pull_request:
7+
branches:
8+
- '5.[0-9]+'
9+
schedule:
10+
- cron: '0 6 * * *'
11+
jobs:
12+
CI-CD:
13+
uses: ./.github/workflows/ci-matrix-5.x.yml
14+
secrets: inherit
15+
with:
16+
branch: ${{ github.event_name == 'schedule' && vars.VERTX_5_STABLE_BRANCH || github.event.pull_request.head.sha || github.ref_name }}

.github/workflows/ci-5.x.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ on:
33
push:
44
branches:
55
- master
6-
- '5.[0-9]+'
76
pull_request:
87
branches:
98
- master
10-
- '5.[0-9]+'
9+
schedule:
10+
- cron: '0 5 * * *'
1111
jobs:
1212
CI-CD:
1313
uses: ./.github/workflows/ci-matrix-5.x.yml

.github/workflows/schedule-5.x-stable.yml

Lines changed: 0 additions & 10 deletions
This file was deleted.

.github/workflows/schedule-5.x.yml

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)