Skip to content

Commit 842c7f2

Browse files
committed
GH Actions: run on new 4.x branch
1 parent 9befa02 commit 842c7f2

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

.github/workflows/build-phar.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
push:
77
branches:
88
- master
9-
- 4.0
9+
- 4.x
1010
paths:
1111
- '.github/workflows/build-phar.yml'
1212
- '.github/workflows/reusable-build-phar.yml'

.github/workflows/label-merge-conflicts.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
push:
66
branches:
77
- master
8-
- 4.0
8+
- 4.x
99
# Check conflicts in new PRs and for resolved conflicts due to an open PR being updated.
1010
pull_request_target:
1111
types:

.github/workflows/quicktest.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
name: Quicktest
22

33
on:
4-
# Run on pushes to all branches except for `master`/`4.0`.
4+
# Run on pushes to all branches except for `master`/`4.x`.
55
push:
66
branches-ignore:
77
- master
8-
- 4.0
8+
- 4.x
99
paths-ignore:
1010
- '**.md'
1111
# Allow manually triggering the workflow.

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
name: Test
22

33
on:
4-
# Run on pushes to `master`/`4.0` and on all pull requests.
4+
# Run on pushes to `master`/`4.x` and on all pull requests.
55
# Prevent the build from running when there are only irrelevant changes.
66
push:
77
branches:
88
- master
9-
- 4.0
9+
- 4.x
1010
tags:
1111
- '**'
1212
paths-ignore:

0 commit comments

Comments
 (0)