Skip to content

Commit 28bc755

Browse files
committed
Update file .travis.yml
1 parent 9bb76b4 commit 28bc755

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

.travis.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,19 @@ php:
1111
- "7.3"
1212
- "7.2"
1313
- "7.1"
14-
- "nightly"
1514

1615
env:
16+
- CONTAO_VERSION=~4.7.0
1717
- CONTAO_VERSION=~4.6.0
1818
- CONTAO_VERSION=~4.5.0
1919
- CONTAO_VERSION=~4.4.0
2020

2121
# Exclude impossible Contao Version combinations.
2222
matrix:
2323
exclude:
24+
fast_finish: true
2425
allow_failures:
26+
- env: CONTAO_VERSION=~4.7.0
2527
- env: CONTAO_VERSION=~4.6.0
2628
- env: CONTAO_VERSION=~4.5.0
2729

@@ -33,12 +35,18 @@ before_script:
3335
if [ "x${TRAVIS_TAG}" != "x" ]; then
3436
export COMPOSER_ROOT_VERSION=${TRAVIS_TAG}
3537
else
36-
export COMPOSER_ROOT_VERSION=$([[ ${TRAVIS_BRANCH} =~ hotfix/([0-9.]*(-(alpha|beta|rc)[0-9]+)?) ]] \
37-
&& echo ${BASH_REMATCH[1]} \
38+
export COMPOSER_ROOT_VERSION=$([[ ${TRAVIS_BRANCH} =~ (hotfix|release)/([0-9.]*(-(alpha|beta|rc)[0-9]+)?) ]] \
39+
&& echo ${BASH_REMATCH[2]} \
3840
|| echo dev-${TRAVIS_BRANCH})
3941
fi
4042
- echo "Using root version ${COMPOSER_ROOT_VERSION}"
41-
- travis_retry composer update --prefer-dist --no-interaction
43+
- >
44+
echo "PHP version: ${TRAVIS_PHP_VERSION}";
45+
if [ "x${TRAVIS_PHP_VERSION}" == "xnightly" ]; then
46+
travis_retry composer update --ignore-platform-reqs --prefer-dist --no-interaction --no-suggest
47+
else
48+
travis_retry composer update --prefer-dist --no-interaction --no-suggest
49+
fi
4250
4351
script: ant -keep-going
4452

0 commit comments

Comments
 (0)