mirrors
/
Labrador
mirror of https://github.com/EspoTek/Labrador.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert travis changes - using regular qt)

This commit is contained in:
Chris Esposito 2020-10-07 19:02:08 +11:00
parent 7b2c4feee3
commit 2d8430c9f9
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@ -35,10 +35,8 @@ install:
- | - |
# OSX # OSX
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
brew uninstall --ignore-dependencies qt # Remove Qt 5.13 brew install qt5
brew tap uncovertruth/qt brew link qt5 --force
brew install qt
brew link qt --force
#brew install libusb #brew install libusb
#brew install wget #brew install wget
# Linux # Linux
@ -52,8 +50,6 @@ script:
# OSX # OSX
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
cd Desktop_Interface cd Desktop_Interface
echo "QMAKE_VERSION"
qmake --version
qmake CONFIG+=release PREFIX=/usr DEFINES+=GIT_HASH_SHORT=$(git rev-parse --short HEAD) qmake CONFIG+=release PREFIX=/usr DEFINES+=GIT_HASH_SHORT=$(git rev-parse --short HEAD)
make -j$(sysctl -n hw.ncpu) make -j$(sysctl -n hw.ncpu)
mkdir -p bin/Labrador.app/Contents/MacOS/Resources mkdir -p bin/Labrador.app/Contents/MacOS/Resources