data.coop/pinafore
8
0
Fork 0
Code Issues 1 Pull requests Packages Projects Releases Wiki Activity

fix redis issue in travis without building redis from source (#619)

Browse source
This commit is contained in:
Nolan Lawson 2018-11-05 08:58:26 -08:00 committed by GitHub
parent 819c1e6b8d
commit 924885e532
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -33,8 +33,8 @@ addons:
- postgresql-client-10 - postgresql-client-10
- postgresql-contrib-10 - postgresql-contrib-10
- protobuf-compiler - protobuf-compiler
- redis-server
- redis-tools - redis-tools
- tcl # required to build redis from source
- zlib1g-dev - zlib1g-dev
before_install: before_install:
- npm install -g npm@6 - npm install -g npm@6

13
bin/setup-mastodon-in-travis.sh
View file

@ -11,13 +11,12 @@ source "$HOME/.rvm/scripts/rvm"
rvm install 2.5.1 rvm install 2.5.1
rvm use 2.5.1 rvm use 2.5.1
# build redis from source until this is fixed: https://git.io/fxjkb # fix for redis IPv6 issue
curl -O http://download.redis.io/redis-stable.tar.gz # https://travis-ci.community/t/trusty-environment-redis-server-not-starting-with-redis-tools-installed/650/2
tar -xzf redis-stable.tar.gz sudo sed -e 's/^bind.*/bind 127.0.0.1/' /etc/redis/redis.conf > redis.conf
cd redis-stable sudo mv redis.conf /etc/redis
make sudo service redis-server start
sudo make install echo PING | nc localhost 6379 # check redis running
redis-server --daemonize yes
# install ffmpeg from PPA because it's not in Trusty # install ffmpeg from PPA because it's not in Trusty
sudo -E add-apt-repository -y ppa:mc3man/trusty-media sudo -E add-apt-repository -y ppa:mc3man/trusty-media