Skip to content

Commit

Permalink
Merge f9bf9d8 into 3880e00
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Wilson committed May 24, 2016
2 parents 3880e00 + f9bf9d8 commit 918072f
Show file tree
Hide file tree
Showing 34 changed files with 904 additions and 718 deletions.
9 changes: 5 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
vendor
build/
/vendor
/build/
docs/api/cache
.vagrant
.idea/
/.vagrant
/.idea/
.env
63 changes: 41 additions & 22 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,39 +1,58 @@
language: php

php:
- 5.6
- 7.0
- hhvm
- nightly

sudo: required
services:
- docker

env:
global:
- DOCKER_VERSION=1.10.1-0~trusty
- DOCKER_COMPOSE_VERSION=1.7.1
matrix:
- TEST_SCRIPT="bin/spider-dev --php=7.0 test"
- TEST_SCRIPT="bin/spider-dev --php=5.6 test"
- TEST_SCRIPT="bin/spider-dev --hhvm=latest test"
- TEST_SCRIPT="bin/run-ci-test.sh"

matrix:
allow_failures:
exclude:
- php: nightly
- php: 7.0
env:
- NEO4J_VERSION="2.2.4" GREMLINSERVER_VERSION="3.0.2" ORIENT_VERSION="2.1.6"
env: TEST_SCRIPT="bin/spider-dev --php=7.0 test"
- php: nightly
env: TEST_SCRIPT="bin/spider-dev --php=5.6 test"
- php: nightly
env: TEST_SCRIPT="bin/spider-dev --hhvm=latest test"
- php: 5.6
env: TEST_SCRIPT="bin/run-ci-test.sh"
allow_failures:
- php: nightly

cache:
directories:
- ./vendor

before_install:
- sudo apt-get update > /dev/null
# upgrade docker-engine to specific version
- sudo apt-get -o Dpkg::Options::="--force-confnew" install -y docker-engine=${DOCKER_VERSION}

# reinstall docker-compose at specific version
- sudo rm /usr/local/bin/docker-compose
- curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
- chmod +x docker-compose
- sudo mv docker-compose /usr/local/bin

install:
# install Oracle JDK8
- sh -c ./CI/jdk8-install.sh
# install gremlin-server
- sh -c ./CI/gremlin-server/install.sh
# install neo4j
- sh -c ./CI/neo4j/install.sh
# install orient
- sh -c ./CI/orient/install.sh
- curl -sS https://getcomposer.org/installer | php
- travis_retry php composer.phar install

before_script:
- travis_retry composer self-update
- travis_retry composer install --no-interaction --prefer-source --dev
- mkdir -p build/logs

script:
- mkdir -p build/logs
- php vendor/bin/phpunit -c phpunit.xml.dist
- $TEST_SCRIPT

after_script:
- php vendor/bin/coveralls -v

- php vendor/bin/coveralls -v
64 changes: 0 additions & 64 deletions CI/gremlin-server/gremlin-server-spider.yaml

This file was deleted.

39 changes: 0 additions & 39 deletions CI/gremlin-server/gremlin-spider-script.groovy

This file was deleted.

22 changes: 0 additions & 22 deletions CI/gremlin-server/install.sh

This file was deleted.

15 changes: 0 additions & 15 deletions CI/jdk8-install.sh

This file was deleted.

14 changes: 0 additions & 14 deletions CI/neo4j/install.sh

This file was deleted.

16 changes: 0 additions & 16 deletions CI/orient/install.sh

This file was deleted.

28 changes: 0 additions & 28 deletions Vagrantfile

This file was deleted.

5 changes: 5 additions & 0 deletions bin/run-ci-test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/usr/bin/env bash

bin/spider-dev up
sleep 40
php vendor/bin/phpunit -c phpunit.xml.dist

0 comments on commit 918072f

Please sign in to comment.