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

Php53beta #57

Merged
merged 17 commits into from
Jul 6, 2015
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
3 changes: 3 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ FROM centos:centos6
RUN rpm -Uvh http://dl.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm
Run yum -y update

# add composer lock file (prevent github timeouts)
ADD ./root/composer.lock /.composer/composer.lock

ADD ./root/packages.sh /packages.sh
RUN chmod 755 /packages.sh
RUN /packages.sh
Expand Down
12 changes: 6 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
source 'https://rubygems.org'

gem 'docker-api'
gem 'serverspec'
gem 'docker-api', '1.21.4'
gem 'serverspec', '2.8.2'
gem 'specinfra', '2.12.7'
gem 'rspec'
gem 'rake'
gem 'yarjuf'
gem 'rspec', '3.2.0'
gem 'rake', '10.4.2'
gem 'yarjuf', '2.0.0'

gem 'coveralls', require: false
gem 'coveralls', '0.8.1', require: false
20 changes: 18 additions & 2 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,24 @@ dependencies:

test:
override:
- docker-compose -f docker-compose.yml run web /.composer/vendor/phpunit/phpunit/phpunit /var/www/html/
- rake spec
- docker-compose -f docker-compose.yml run web /.composer/vendor/phpunit/phpunit/phpunit /var/www/html/:
timeout: 1200
- rake spec:
timeout: 1200
# start apache in background
- docker-compose -f docker-compose.yml up -d
# ngrock /ghostinspector real request
- wget https://dl.ngrok.com/ngrok_2.0.17_linux_amd64.zip
- unzip ngrok_2.0.17_linux_amd64.zip
- ./ngrok authtoken $NGROK_TOKEN
- ./ngrok http -subdomain=$CIRCLE_SHA1 8888:
background: true
# Wait for application and ngrok to be ready
- curl --retry 10 --retry-delay 10 -v https://$CIRCLE_SHA1.ngrok.io
# Execute Ghost Inspector tests using the ngrok tunnel
- curl "https://api.ghostinspector.com/v1/suites/$GHOST_SUITE_ID/execute/?apiKey=$GHOST_API_KEY&startUrl=https://$CIRCLE_SHA1.ngrok.io" > $CIRCLE_ARTIFACTS/ghostinspector.json
- if [ $(grep -c '"passing":false' $CIRCLE_ARTIFACTS/ghostinspector.json) -ne 0 ]; then exit 1; fi

post:
- mkdir -p $CIRCLE_TEST_REPORTS/junit/
- find . -type f -name "results.xml" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \;
Expand Down
Loading