From a2a084fd16b8dee72e01af6b39090954c3bb93df Mon Sep 17 00:00:00 2001 From: Cesar Blum Silveira Date: Mon, 6 Jun 2016 20:18:10 -0700 Subject: [PATCH] Don't install nginx twice on OSX Travis build. --- .travis.yml | 7 +------ install-nginx.sh | 6 ++++++ 2 files changed, 7 insertions(+), 6 deletions(-) create mode 100755 install-nginx.sh diff --git a/.travis.yml b/.travis.yml index bd88113110..80d172a63e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,14 +6,9 @@ addons: packages: - libunwind8 before_install: - - if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install nginx; brew install openssl; brew link --force openssl; fi + - if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install nginx; brew install openssl; brew link --force openssl; else ./install-nginx.sh; fi install: - - curl -sSL http://nginx.org/download/nginx-1.8.0.tar.gz | tar zxfv - -C /tmp && cd /tmp/nginx-1.8.0/ - - ./configure --prefix=$HOME/nginxinstall --with-http_ssl_module - - make - - make install - export PATH="$PATH:$HOME/nginxinstall/sbin/" - - cd $OLDPWD mono: - 4.0.5 os: diff --git a/install-nginx.sh b/install-nginx.sh new file mode 100755 index 0000000000..9564813c2d --- /dev/null +++ b/install-nginx.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +curl -sSL http://nginx.org/download/nginx-1.8.0.tar.gz | tar zxfv - -C /tmp && cd /tmp/nginx-1.8.0/ +./configure --prefix=$HOME/nginxinstall --with-http_ssl_module +make +make install