Skip to content

Commit

Permalink
Fix travis build
Browse files Browse the repository at this point in the history
  • Loading branch information
pevisscher committed Aug 10, 2016
1 parent c943ae6 commit 75f5fbe
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 9 deletions.
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
language: generic
language: python
matrix:
include:
# Use the built in venv for linux builds
- os: linux
dist: trusty
sudo: required
python: 3.5
# Use generic language for osx
# disabled due to premake bug
#- os: osx
Expand All @@ -14,7 +15,7 @@ install:
- wget -O - https://raw.githubusercontent.com/Zefiros-Software/ZPM/master/script/install-zpm-travis.sh | bash
# annoying pip fix
- export BOTO_CONFIG=/tmp/bogusvalue
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install g++-multilib -y && bash ./script/install-docs.sh; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install g++-multilib -y; fi
script:
- bash ./script/travis-build.sh
after_success:
Expand Down
15 changes: 13 additions & 2 deletions install/bsplib-dev.lua
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,16 @@

dofile( "assets/Zefiros-Software/BSPLib/Zefiros-Software/Anaconda/anaconda.lua" )

os.execute( "pip install mkdocs -U" )
os.execute( "pip install mkdocs-bootswatch -U" )
local anaBin = os.get() == "windows" and os.getenv("UserProfile") .. "/zpm-anaconda/Scripts/" or "~/zpm-anaconda/bin/"

if os.get() == "windows" then
os.executef( "%spip install mkdocs -U", anaBin )
os.executef( "%spip install mkdocs-bootswatch -U", anaBin )
os.executef( "%spip install pymdown-extensions -U", anaBin )
os.executef( "%spip install markdown-checklist -U", anaBin )
else
os.executef( "%s/python3 %spip install mkdocs -U", anaBin, anaBin )
os.executef( "%s/python3 %spip install mkdocs-bootswatch -U", anaBin, anaBin )
os.executef( "%s/python3 %spip install pymdown-extensions -U", anaBin, anaBin )
os.executef( "%s/python3 %spip install markdown-checklist -U", anaBin, anaBin )
end
4 changes: 0 additions & 4 deletions script/install-docs.sh

This file was deleted.

0 comments on commit 75f5fbe

Please sign in to comment.