Skip to content

Commit

Permalink
Merge pull request EC-CUBE#367 from nanasess/fix-travis
Browse files Browse the repository at this point in the history
google-chrome-stable の GPG エラーを改善
  • Loading branch information
nanasess committed Jan 17, 2020
2 parents f5db2ce + bff0fec commit 7eeb469
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,6 @@ php:
- 7.3
- 7.4

addons:
apt:
sources:
- google-chrome
packages:
- dpkg # see https://github.com/travis-ci/travis-ci/issues/9361
- google-chrome-stable

env:
global:
- DBNAME=myapp_test DBSERVER=127.0.0.1 HTTP_URL=http://localhost:8085/ HTTPS_URL=http://localhost:8085/
Expand Down Expand Up @@ -66,6 +58,9 @@ matrix:
- php: 7.3
env: DB=pgsql USER=postgres DBPASS=password DBUSER=postgres COVERAGE=true

before_install:
- if [[ $DIST = 'trusty' ]]; then sudo apt-get -y install google-chrome-stable --allow-unauthenticated ; fi

before_script:
- if [[ $DB = 'mysql' ]]; then mysql -e "SET GLOBAL sql_mode = 'NO_ENGINE_SUBSTITUTION';" ; fi

Expand Down

0 comments on commit 7eeb469

Please sign in to comment.