Merge pull request #42 from CodeforLeipzig/fix_travis_build

fix travis build
This commit is contained in:
Joerg Reichert 2020-01-15 22:42:14 +01:00 committed by GitHub
commit 2050e1c46d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 7 deletions

View file

@ -1 +1 @@
2.5.0 2.5.7

View file

@ -1,11 +1,15 @@
sudo: required sudo: required
before_install:
- sudo apt-get -y install curl
language: ruby language: ruby
cache: bundler rvm: 2.5.7
install:
- rvm use 2.5.7 --install
services: services:
- docker - docker
script: script:
- docker-compose run web rake db:setup - docker-compose run web rake db:setup
- docker-compose run -e CI=true -e TRAVIS=true -e TRAVIS_BRANCH=$TRAVIS_BRANCH -e TRAVIS_COMMIT=$TRAVIS_COMMIT -e TRAVIS_JOB_NUMBER=$TRAVIS_JOB_NUMBER -e TRAVIS_PULL_REQUEST=$TRAVIS_PULL_REQUEST -e TRAVIS_JOB_ID=$TRAVIS_JOB_ID -e TRAVIS_REPO_SLUG=$TRAVIS_REPO_SLUG web bin/run-tests - docker-compose run -e CI=true -e TRAVIS=true -e TRAVIS_BRANCH=$TRAVIS_BRANCH -e TRAVIS_COMMIT=$TRAVIS_COMMIT -e TRAVIS_JOB_NUMBER=$TRAVIS_JOB_NUMBER -e TRAVIS_PULL_REQUEST=$TRAVIS_PULL_REQUEST -e TRAVIS_JOB_ID=$TRAVIS_JOB_ID -e TRAVIS_REPO_SLUG=$TRAVIS_REPO_SLUG web bin/run-tests

View file

@ -1,4 +1,4 @@
FROM ruby:2.5 FROM ruby:2.5.7
RUN curl -sL https://deb.nodesource.com/setup_9.x | bash - && apt-get update && \ RUN curl -sL https://deb.nodesource.com/setup_9.x | bash - && apt-get update && \
apt-get install -y build-essential zlib1g-dev libsqlite3-dev nodejs npm \ apt-get install -y build-essential zlib1g-dev libsqlite3-dev nodejs npm \
libxml2-dev libxslt1-dev pkg-config \ libxml2-dev libxslt1-dev pkg-config \

View file

@ -316,6 +316,3 @@ DEPENDENCIES
tzinfo-data tzinfo-data
uglifier uglifier
validate_url validate_url
BUNDLED WITH
1.16.1