diff --git a/.travis.yml b/.travis.yml index 5c928447..62bb38d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,18 +40,8 @@ services: - redis-server before_install: - npm install -g npm@5 - - rvm install 2.5.0 - - rvm use 2.5.0 - - sudo -E add-apt-repository -y ppa:mc3man/trusty-media - - sudo -E apt-get update - - sudo -E apt-get install -y ffmpeg - - ruby --version - - node --version - - npm --version - - postgres --version - - redis-server --version - - ffmpeg -version - npm install -g greenkeeper-lockfile@1 + - ./bin/setup-mastodon-in-travis.sh before_script: - npm run lint - greenkeeper-lockfile-update diff --git a/bin/setup-mastodon-in-travis.sh b/bin/setup-mastodon-in-travis.sh new file mode 100755 index 00000000..5544a2fa --- /dev/null +++ b/bin/setup-mastodon-in-travis.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env bash + +set -e +set -x + +if [[ "$COMMAND" = deploy-dev-travis ]]; then + exit 0 # no need to setup mastodon in this case +fi + +rvm install 2.5.0 +rvm use 2.5.0 +sudo -E add-apt-repository -y ppa:mc3man/trusty-media +sudo -E apt-get update +sudo -E apt-get install -y ffmpeg +ruby --version +node --version +npm --version +postgres --version +redis-server --version +ffmpeg -version