diff --git a/.travis.yml b/.travis.yml index 7c6283805..75a1ef783 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: php sudo: required -dist: xenial -group: edge +dist: bionic branches: only: @@ -20,11 +19,10 @@ notifications: - "\x030[\x0310Travis-ci\x030]\x03 Commit \x0314{%{commit}}\x03 by \x0315(%{author})\x03@\x0313%{repository_name}/%{branch}\x03 has \x037%{result}\x03: \x032%{build_url}\x03" php: - - '7.3' - '7.4' addons: - mariadb: '10.2' + mariadb: '10.4' apt: packages: - curl @@ -41,7 +39,6 @@ install: # Configure environment settings - cp .env.travis .env # Install composer packages. - - composer global require hirak/prestissimo - composer install --prefer-dist before_script: diff --git a/composer.json b/composer.json index cc07e32e6..e25e7ca1f 100755 --- a/composer.json +++ b/composer.json @@ -31,12 +31,6 @@ "optimize-autoloader": true }, "description": "A Usenet Indexer", - "extra": { - "branch-alias": { - "dev-dev": "1.x-dev" - } - - }, "keywords": [ "NNTmux", "newznab-tmux", diff --git a/composer.lock b/composer.lock index 4ccf7fc72..be1dab6bf 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "f507d2a8906f891af68933e1d18c169f", + "content-hash": "5f9478c3a5991536417508a5606f9ac1", "packages": [ { "name": "aharen/omdbapi",