diff --git a/.travis.yml b/.travis.yml index bce37ed..b49cee1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,22 +14,19 @@ matrix: compiler: clang env: PLATFORM=osx - PATH=/usr/local/opt/qt5/bin:$HOME/local/bin:$PATH - LD_LIBRARY_PATH=/usr/local/opt/qt5/lib:$LD_LIBRARY_PATH + PATH=/Users/travis/local/bin:$PATH PYTHONPATH=$PYTHONPATH:$HOME/local/lib/python2.7/site-packages - os: linux compiler: g++ env: PLATFORM=linux - PATH=/home/travis/local/bin:$HOME/local/bin:$PATH - LD_LIBRARY_PATH=/home/travis/local/lib:$LD_LIBRARY_PATH + PATH=/home/travis/local/bin:$PATH PYTHONPATH=$PYTHONPATH:$HOME/local/lib/python2.7/site-packages - os: linux compiler: clang env: PLATFORM=linux - PATH=/home/travis/local/bin:$HOME/local/bin:$PATH - LD_LIBRARY_PATH=/home/travis/local/lib:$LD_LIBRARY_PATH + PATH=/home/travis/local/bin:$PATH PYTHONPATH=$PYTHONPATH:$HOME/local/lib/python2.7/site-packages QMAKESPEC=linux-clang install: "./scripts/travis/install.sh" diff --git a/packthing.yml b/packthing.yml index 5dbd595..440812d 100644 --- a/packthing.yml +++ b/packthing.yml @@ -20,7 +20,7 @@ target: repo: - path: "propelleride" url: "https://github.com/parallaxinc/PropellerIDE.git" - tag: "0.31.15" + tag: "0.31.16" type: "qmake" master: true icon: "icons/icon-new.png" diff --git a/scripts/travis/install.sh b/scripts/travis/install.sh index e43bbf5..66a954a 100755 --- a/scripts/travis/install.sh +++ b/scripts/travis/install.sh @@ -5,7 +5,10 @@ git submodule update --init --recursive case "$PLATFORM" in "osx") - brew install tree qt5 + brew install tree + wget -4 http://lamestation.net/downloads/travis/qt5.5.0-mac-clang.tgz + tar xzf qt5.5.0-mac-clang.tgz + mv local/ /Users/travis/local/ ;; "linux") # wget -4 http://lamestation.net/downloads/travis/qt5.5.0-linux-g++.tgz