diff --git a/.travis.yml b/.travis.yml index d519b075..849626e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,13 @@ branches: - /.*/ php: - - 7.2 - - 7.3 + - '7.2' + - '7.3' + - '7.4' + +matrix: + allow_failures: + - php: '7.4' services: - mysql diff --git a/CHANGELOG.md b/CHANGELOG.md index cadc1546..3e1cf5b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this #### Changed -* *Nothing* +* [#450](https://github.com/shlinkio/shlink/issues/450) Added PHP 7.4 to the build matrix, as an allowed-to-fail env. #### Deprecated