Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix integration tests using docker #867

Merged
merged 2 commits into from
Apr 17, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Thumbs.db
generator/*

# Elasticsearch related
util/elasticsearch/
util/elasticsearch
util/cache/
util/output

Expand Down
16 changes: 6 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
language: php

jdk:
- oraclejdk8

addons:
apt:
packages:
- oracle-java8-installer
services:
- docker

branches:
except:
Expand Down Expand Up @@ -43,11 +38,9 @@ matrix:
env:
global:
- ES_TEST_HOST=http://localhost:9200
- JAVA_HOME="/usr/lib/jvm/java-8-oracle/jre"

before_install:
- sudo update-java-alternatives -s java-8-oracle
- ./travis/download_and_run_es.sh
- ./travis/run_es_docker.sh

install:
- composer install --prefer-dist
Expand All @@ -65,3 +58,6 @@ script:

after_script:
- if [ $TRAVIS_PHP_VERSION = '7.3' ]; then php vendor/bin/coveralls; fi

notifications:
email: true
5 changes: 2 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"cpliakas/git-wrapper": "~1.0",
"doctrine/inflector": "^1.1",
"mockery/mockery": "^1.2",
"phpstan/phpstan-shim": "0.9.1",
"phpstan/phpstan-shim": "^0.9",
"phpunit/phpunit": "6.3.0",
"squizlabs/php_codesniffer": "3.0.2",
"symfony/finder": "^2.8",
Expand Down Expand Up @@ -52,8 +52,7 @@
"phpcs --standard=ruleset.xml --extensions=php --encoding=utf-8 --tab-width=4 -sp tests"
],
"phpstan": [
"@php vendor/phpstan/phpstan-shim/phpstan.phar analyse -c phpstan-src.neon src --level 2 --no-progress",
"@php vendor/phpstan/phpstan-shim/phpstan.phar analyse -c phpstan-tests.neon tests --level 7 --no-progress"
"@php vendor/phpstan/phpstan-shim/phpstan.phar analyse -c phpstan-src.neon src --level 2 --no-progress"
]
}
}
2 changes: 1 addition & 1 deletion phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
beStrictAboutOutputDuringTests="true"
>
<php>
<server name="ES_TEST_HOST" value=""/>
<env name="ES_TEST_HOST" value=""/>
</php>
<testsuites>
<testsuite name="Tests">
Expand Down
Loading