Skip to content

Commit 508a72a

Browse files
committed
Travis: Refresh config
Now that PHPCS 3.3.1 is a minimum, we don't have any env + php combinations to exclude, so can use matrix expansion.
1 parent afe2663 commit 508a72a

File tree

1 file changed

+16
-50
lines changed

1 file changed

+16
-50
lines changed

.travis.yml

Lines changed: 16 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,23 @@ script:
2424
# Run ruleset tests.
2525
- ./bin/ruleset-tests
2626

27+
env:
28+
# `master` is now 3.x.
29+
- PHPCS_BRANCH="dev-master"
30+
# Lowest supported release in the 3.x series with which VIPCS is compatible.
31+
- PHPCS_BRANCH="3.3.1"
32+
33+
php:
34+
- 5.6
35+
- 7.0
36+
- 7.1
37+
- 7.2
38+
- 7.3
39+
- "7.4snapshot"
40+
2741
# Rather than a `matrix` property, we use build stages. This allows early
2842
# build failure for basic linting and sniffing issues.
2943
# @link https://docs.travis-ci.com/user/build-stages/
30-
#
31-
# PHP >= 7.3 & PHPCS < 3.3.1 is known to fail.
32-
# @link https://github.com/squizlabs/PHP_CodeSniffer/issues/2086.
33-
#
34-
# We can't use Matrix Expansion here, since we need to exclude jobs for the known failures,
35-
# which Matrix Expansion does not yet support. We list each combination instead.
36-
# @link https://docs.travis-ci.com/user/conditional-builds-stages-jobs/#conditional-jobs
3744

3845
stages:
3946
- lint
@@ -43,11 +50,10 @@ stages:
4350
jobs:
4451
allow_failures:
4552
- php: "7.4snapshot"
46-
fast_finish: true
4753
include:
4854

4955
- stage: lint
50-
php: 7.2
56+
php: 7.3
5157
env: PHPCS_BRANCH="dev-master"
5258
before_install: phpenv config-rm xdebug.ini || echo 'No xdebug config.'
5359
install: false
@@ -70,52 +76,12 @@ jobs:
7076
- libxml2-utils
7177

7278
- stage: sniff
73-
php: 7.2
79+
php: 7.3
7480
env: PHPCS_BRANCH="dev-master"
7581
before_install: phpenv config-rm xdebug.ini || echo 'No xdebug config.'
7682
install: composer install --dev --no-suggest
7783
script:
7884
# Run PHPCS against VIPCS.
7985
- ./bin/phpcs
8086

81-
# PHPCS 3.2.3 is the lowest supported release
82-
- stage: test
83-
php: 5.6
84-
env: PHPCS_BRANCH="dev-master"
85-
86-
- stage: test
87-
php: 5.6
88-
env: PHPCS_BRANCH="3.2.3"
89-
90-
- stage: test
91-
php: 7.0
92-
env: PHPCS_BRANCH="dev-master"
93-
94-
- stage: test
95-
php: 7.0
96-
env: PHPCS_BRANCH="3.2.3"
97-
98-
- stage: test
99-
php: 7.1
100-
env: PHPCS_BRANCH="dev-master"
101-
102-
- stage: test
103-
php: 7.1
104-
env: PHPCS_BRANCH="3.2.3"
105-
106-
- stage: test
107-
php: 7.2
108-
env: PHPCS_BRANCH="dev-master"
109-
110-
- stage: test
111-
php: 7.2
112-
env: PHPCS_BRANCH="3.2.3"
11387

114-
# Only use PHPCS_BRANCH="dev-master" from this point, because PHPCS 3.3.1+ is needed to support PHP 7.3+
115-
- stage: test
116-
php: 7.3
117-
env: PHPCS_BRANCH="dev-master"
118-
119-
- stage: test
120-
php: "7.4snapshot"
121-
env: PHPCS_BRANCH="dev-master"

0 commit comments

Comments
 (0)