Skip to content

Commit d353549

Browse files
committed
Revert "Split CI workflow to prevent schedule inactivity from pausing push/PR builds (eclipse-vertx#1629)"
This reverts commit 900cc1f.
1 parent f147e15 commit d353549

4 files changed

Lines changed: 9 additions & 13 deletions

File tree

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
name: vertx-sql-client (5.x-stable)
22
on:
3+
push:
4+
branches:
5+
- '5.[0-9]+'
6+
pull_request:
7+
branches:
8+
- '5.[0-9]+'
39
schedule:
410
- cron: '0 6 * * *'
511
jobs:
612
CI-CD:
713
uses: ./.github/workflows/ci-matrix-5.x.yml
814
secrets: inherit
915
with:
10-
branch: ${{ github.event_name == 'schedule' && vars.VERTX_5_STABLE_BRANCH || github.ref_name }}
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.yml

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

0 commit comments

Comments
 (0)