diff --git a/.github/workflows/build-phar.yml b/.github/workflows/build-phar.yml index 2bb771f26c..6c13cba0a2 100644 --- a/.github/workflows/build-phar.yml +++ b/.github/workflows/build-phar.yml @@ -6,7 +6,7 @@ on: push: branches: - master - - 4.0 + - 4.x paths: - '.github/workflows/build-phar.yml' - '.github/workflows/reusable-build-phar.yml' diff --git a/.github/workflows/label-merge-conflicts.yml b/.github/workflows/label-merge-conflicts.yml index 6eac6fc86b..6ba10b3e73 100644 --- a/.github/workflows/label-merge-conflicts.yml +++ b/.github/workflows/label-merge-conflicts.yml @@ -5,7 +5,7 @@ on: push: branches: - master - - 4.0 + - 4.x # Check conflicts in new PRs and for resolved conflicts due to an open PR being updated. pull_request_target: types: diff --git a/.github/workflows/quicktest.yml b/.github/workflows/quicktest.yml index ae4ea326b4..43d4790dee 100644 --- a/.github/workflows/quicktest.yml +++ b/.github/workflows/quicktest.yml @@ -1,11 +1,11 @@ name: Quicktest on: - # Run on pushes to all branches except for `master`/`4.0`. + # Run on pushes to all branches except for `master`/`4.x`. push: branches-ignore: - master - - 4.0 + - 4.x paths-ignore: - '**.md' # Allow manually triggering the workflow. diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 83da62422a..83b47b812e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,12 +1,12 @@ name: Test on: - # Run on pushes to `master`/`4.0` and on all pull requests. + # Run on pushes to `master`/`4.x` and on all pull requests. # Prevent the build from running when there are only irrelevant changes. push: branches: - master - - 4.0 + - 4.x tags: - '**' paths-ignore: