From 97e3bbb2d8c6cedd3187480362372549337f3c15 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Wed, 15 Jan 2020 21:34:59 +0100 Subject: [PATCH] fix travis build --- .ruby-version | 2 +- .travis.yml | 8 ++++++-- Dockerfile | 2 +- Gemfile.lock | 3 --- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.ruby-version b/.ruby-version index 437459c..35d16fb 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.5.0 +2.5.7 diff --git a/.travis.yml b/.travis.yml index 73cfa9f..ec0ec10 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,15 @@ sudo: required +before_install: + - sudo apt-get -y install curl language: ruby -cache: bundler +rvm: 2.5.7 +install: + - rvm use 2.5.7 --install services: - docker script: - 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 diff --git a/Dockerfile b/Dockerfile index a65ed1e..42aa471 100755 --- a/Dockerfile +++ b/Dockerfile @@ -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 && \ apt-get install -y build-essential zlib1g-dev libsqlite3-dev nodejs npm \ libxml2-dev libxslt1-dev pkg-config \ diff --git a/Gemfile.lock b/Gemfile.lock index 67a42dd..1ff4086 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -316,6 +316,3 @@ DEPENDENCIES tzinfo-data uglifier validate_url - -BUNDLED WITH - 1.16.1