Skip to content

Commit

Permalink
Merge pull request #697 from sergeyklay/3.0.x
Browse files Browse the repository at this point in the history
Added Phalcon 3.0.2 test support
  • Loading branch information
sergeyklay authored Nov 27, 2016
2 parents fe4cac6 + bee79f5 commit 0fcc322
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 59 deletions.
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@ dist: trusty

env:
global:
- DOCKER_COMPOSE_VERSION="1.7.0" PHALCON_SRC_PATH="${TRAVIS_BUILD_DIR}/cphalcon"
- DOCKER_COMPOSE_VERSION="1.8.1" PHALCON_SRC_PATH="${TRAVIS_BUILD_DIR}/cphalcon"
matrix:
- PHALCON_VERSION="3.0.x"
- PHALCON_VERSION="v3.0.0"
- PHALCON_VERSION="v3.0.1"
- PHALCON_VERSION="v3.0.2"

before_install:
- sudo service memcached stop
Expand Down Expand Up @@ -46,6 +45,8 @@ install:
before_script:
- stty cols 160
- docker-compose -p incubator up -d
- docker-compose -p incubator ps
- docker logs incubator_aerospike
- sleep 1

script:
Expand Down
4 changes: 1 addition & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ services:

aerospike:
restart: always
image: aerospike
image: aerospike:3.10.1
container_name: incubator_aerospike
expose:
- "3000"
Expand All @@ -50,8 +50,6 @@ services:
- "3001:3001"
- "3002:3002"
- "3003:3003"
volumes:
- ./tests/_ci/aerospike.conf:/etc/aerospike/aerospike.conf

mongodb:
restart: always
Expand Down
53 changes: 0 additions & 53 deletions tests/_ci/aerospike.conf

This file was deleted.

0 comments on commit 0fcc322

Please sign in to comment.