From 27305faecdb1085fcdd6073ab774994d3778a601 Mon Sep 17 00:00:00 2001 From: Elijah Lazkani Date: Sat, 18 Mar 2017 01:27:54 -0400 Subject: [PATCH] Fixing OS specific commands for travis --- .travis.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1e89fc5..2e0420f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -#language: python +language: python matrix: include: @@ -10,16 +10,18 @@ matrix: python: 2.7 - os: osx osx_image: xcode8.2 + language: generic before_install: - - sudo apt-get update + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update ; fi - curl -L http://bootstrap.saltstack.org | sudo sh -s -- git develop install: - sudo mkdir -p /srv/salt/states - sudo cp -r salty/base/* /srv/salt/states - sudo cp -r .travis/minion /etc/salt/minion - - sudo service salt-minion restart + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo service salt-minion restart; fi - sudo sh .travis/grains.sh script: