Fixes for travis (#2467)

* fixes for travis
This commit is contained in:
David Bomba 2018-10-25 21:14:09 +11:00 committed by GitHub
parent dac1aa88d5
commit dffafc20af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 54 additions and 25 deletions

28
.env.dusk.local Normal file
View File

@ -0,0 +1,28 @@
APP_ENV=local
APP_DEBUG=true
APP_LOCALE=en
APP_URL=http://ninja.test:8000
APP_KEY=s7epnjtomsdond5zgfqgaqmwhhcjct02
APP_CIPHER=AES-256-CBC
REQUIRE_HTTPS=false
NINJA_ENVIRONMENT=hosted
DB_TYPE=mysql
DB_STRICT=false
DB_HOST=localhost
DB_USERNAME=ninja
DB_PASSWORD=ninja
DB_DATABASE1=ninja1
DB_DATABASE2=ninja2
MAIL_DRIVER=smtp
MAIL_PORT=587
MAIL_ENCRYPTION=tls
MAIL_HOST=
MAIL_USERNAME=
MAIL_FROM_NAME=
MAIL_FROM_ADDRESS=
MAIL_PASSWORD=
MAILGUN_DOMAIN=
MAILGUN_SECRET=
AUTH_PROVIDER=users

View File

@ -1,6 +1,6 @@
APP_ENV=development APP_ENV=local
APP_DEBUG=false APP_DEBUG=false
APP_URL=http://ninja.test APP_URL=http://127.0.0.1:8000
APP_KEY=SomeRandomStringSomeRandomString APP_KEY=SomeRandomStringSomeRandomString
APP_CIPHER=AES-256-CBC APP_CIPHER=AES-256-CBC
APP_LOCALE=en APP_LOCALE=en
@ -10,8 +10,9 @@ DB_HOST=localhost
DB_USERNAME=ninja DB_USERNAME=ninja
DB_PASSWORD=ninja DB_PASSWORD=ninja
DB_DATABASE1=ninja1 DB_CONNECTION=db-ninja-01
DB_DATABASE2=ninja2 DB_DATABASE1=ninja01
DB_DATABASE2=ninja02
MAIL_DRIVER=log MAIL_DRIVER=log
TRAVIS=true TRAVIS=true

View File

@ -9,6 +9,7 @@ php:
- 7.2 - 7.2
addons: addons:
chrome: stable
hosts: hosts:
- www.ninja.test - www.ninja.test
@ -29,6 +30,7 @@ before_install:
- composer self-update && composer -V - composer self-update && composer -V
# - export USE_ZEND_ALLOC=0 # - export USE_ZEND_ALLOC=0
- rvm use 1.9.3 --install --fuzzy - rvm use 1.9.3 --install --fuzzy
- cp .env.travis .env
install: install:
# install Composer dependencies # install Composer dependencies
@ -36,11 +38,10 @@ install:
# these providers require referencing git commit's which cause Travis to fail # these providers require referencing git commit's which cause Travis to fail
# - sed -i '/mollie/d' composer.json # - sed -i '/mollie/d' composer.json
# - sed -i '/2checkout/d' composer.json # - sed -i '/2checkout/d' composer.json
- travis_retry composer install --prefer-dist; - travis_retry composer install --no-interaction --prefer-dist --no-suggest
before_script: before_script:
# copy configuration files # copy configuration files
- cp .env.travis .env
- php artisan key:generate --no-interaction - php artisan key:generate --no-interaction
- sed -i '$a NINJA_DEV=true' .env - sed -i '$a NINJA_DEV=true' .env
# create the database and user # create the database and user
@ -52,19 +53,14 @@ before_script:
- php artisan migrate --database=db-ninja-01 --seed --no-interaction - php artisan migrate --database=db-ninja-01 --seed --no-interaction
- php artisan migrate --database=db-ninja-02 --seed --no-interaction - php artisan migrate --database=db-ninja-02 --seed --no-interaction
- php artisan optimize - php artisan optimize
# migrate and seed the database # migrate and seed the database
# Start webserver on ninja.test:8000 # Start webserver on ninja.test:8000
- php artisan serve --host=www.ninja.test --port=8000 & # '&' allows to run in background - google-chrome-stable --headless --disable-gpu --remote-debugging-port=9222 http://localhost &
# Start PhantomJS - php artisan serve &
- phantomjs --webdriver=4444 & # '&' allows to run in background
# Give it some time to start
- sleep 5
# Make sure the app is up-to-date
script: script:
- php ./vendor/bin/phpunit --debug --verbose --coverage-clover=coverage.xml - php ./vendor/bin/phpunit --debug --verbose --coverage-clover=coverage.xml
- php artisan dusk
after_success: after_success:
- bash <(curl -s https://codecov.io/bash) - bash <(curl -s https://codecov.io/bash)

24
composer.lock generated
View File

@ -862,16 +862,16 @@
}, },
{ {
"name": "laravel/framework", "name": "laravel/framework",
"version": "v5.7.10", "version": "v5.7.11",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/framework.git", "url": "https://github.com/laravel/framework.git",
"reference": "7d748c33b8c409b9b0c96704d6493853de41754d" "reference": "52ee19c53c4fcd7fea8a83aacae5b8bc212ae19b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/7d748c33b8c409b9b0c96704d6493853de41754d", "url": "https://api.github.com/repos/laravel/framework/zipball/52ee19c53c4fcd7fea8a83aacae5b8bc212ae19b",
"reference": "7d748c33b8c409b9b0c96704d6493853de41754d", "reference": "52ee19c53c4fcd7fea8a83aacae5b8bc212ae19b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1001,7 +1001,7 @@
"framework", "framework",
"laravel" "laravel"
], ],
"time": "2018-10-23T14:05:19+00:00" "time": "2018-10-24T12:50:20+00:00"
}, },
{ {
"name": "laravel/socialite", "name": "laravel/socialite",
@ -1068,24 +1068,28 @@
}, },
{ {
"name": "laravel/telescope", "name": "laravel/telescope",
"version": "v0.1.1", "version": "v0.1.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/telescope.git", "url": "https://github.com/laravel/telescope.git",
"reference": "77deb0410a18af3b3dcf64cdc99eec62179db16a" "reference": "253dde9a80d50e90c7f9d4d6621151acf556d1a1"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/telescope/zipball/77deb0410a18af3b3dcf64cdc99eec62179db16a", "url": "https://api.github.com/repos/laravel/telescope/zipball/253dde9a80d50e90c7f9d4d6621151acf556d1a1",
"reference": "77deb0410a18af3b3dcf64cdc99eec62179db16a", "reference": "253dde9a80d50e90c7f9d4d6621151acf556d1a1",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-json": "*", "ext-json": "*",
"laravel/framework": "~5.7.7",
"moontoast/math": "^1.1", "moontoast/math": "^1.1",
"php": "^7.1.3", "php": "^7.1.3",
"symfony/var-dumper": "^4.1" "symfony/var-dumper": "^4.1"
}, },
"require-dev": {
"nunomaduro/larastan": "^0.3.4"
},
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
@ -1122,7 +1126,7 @@
"laravel", "laravel",
"monitoring" "monitoring"
], ],
"time": "2018-10-23T18:09:26+00:00" "time": "2018-10-24T11:28:33+00:00"
}, },
{ {
"name": "laravel/tinker", "name": "laravel/tinker",

View File

@ -15,7 +15,7 @@ return [
| |
*/ */
'default' => env('CACHE_DRIVER', 'redis'), 'default' => env('CACHE_DRIVER', 'file'),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------