Skip to content
This repository was archived by the owner on Nov 10, 2020. It is now read-only.

Commit

Permalink
Merge pull request #88 from tahnik/mac_build_fix
Browse files Browse the repository at this point in the history
Fixing mac build
  • Loading branch information
tahnik authored Jul 20, 2017
2 parents 0fb518c + 74a4d9e commit d664237
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ cache:
directories:
- node_modules
- $HOME/.npm
yarn: true

# build essentials for the linux build
addons:
Expand All @@ -45,12 +44,11 @@ before_install:
curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -;
echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list;
sudo apt-get update -qq;
sudo apt-get install yarn -y -qq;
fi
# if we are currently rocking on osx, make sure to update and install yarn over brew package manager
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
brew update;
brew install yarn;
npm install -g 7zip-bin-mac;
fi

# on linux, install yarn over apt, on osx, over brew
Expand All @@ -65,8 +63,8 @@ install:
# MAKE SURE TO ONLY PACKAGE IF WE ARE ON MASTER. For testing, package:dir will be used.
script:
- npm rebuild node-sass
- yarn ci:all
- npm run ci:all

# only deploy to github if the CI script exited with 0. Make sure to do this only if we are on master.
after_success:
- if [[ "$TRAVIS_BRANCH" == "master" ]]; then yarn ci:deploy; fi
- if [[ "$TRAVIS_BRANCH" == "master" ]]; then npm run ci:deploy; fi

0 comments on commit d664237

Please sign in to comment.