mirror of https://github.com/EspoTek/Labrador.git
travis.yml semicolons
This commit is contained in:
parent
0dad6a557a
commit
669cae55a4
80
.travis.yml
80
.travis.yml
|
@ -11,73 +11,73 @@ matrix:
|
||||||
before_install:
|
before_install:
|
||||||
# OSX
|
# OSX
|
||||||
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
|
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
|
||||||
brew update
|
brew update;
|
||||||
# Linux
|
# Linux
|
||||||
elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
|
elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
|
||||||
sudo add-apt-repository ppa:beineri/opt-qt593-trusty -y
|
sudo add-apt-repository ppa:beineri/opt-qt593-trusty -y;
|
||||||
sudo apt-get update -qq
|
sudo apt-get update -qq;
|
||||||
fi
|
fi
|
||||||
|
|
||||||
install:
|
install:
|
||||||
# OSX
|
# OSX
|
||||||
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
|
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
|
||||||
brew install qt5
|
brew install qt5;
|
||||||
brew link qt5 --force
|
brew link qt5 --force;
|
||||||
brew install libusb
|
brew install libusb;
|
||||||
brew install wget
|
brew install wget;
|
||||||
# Linux
|
# Linux
|
||||||
elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
|
elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
|
||||||
sudo apt-get -y install qt59base libusb-1.0-0-dev
|
sudo apt-get -y install qt59base libusb-1.0-0-dev;
|
||||||
source /opt/qt*/bin/qt*-env.sh
|
source /opt/qt*/bin/qt*-env.sh;
|
||||||
fi
|
fi
|
||||||
|
|
||||||
script:
|
script:
|
||||||
# OSX
|
# OSX
|
||||||
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
|
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
|
||||||
cd Desktop_Interface
|
cd Desktop_Interface;
|
||||||
qmake CONFIG+=release PREFIX=/usr
|
qmake CONFIG+=release PREFIX=/usr;
|
||||||
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;
|
||||||
mkdir -p bin/Labrador.app/Contents/Frameworks
|
mkdir -p bin/Labrador.app/Contents/Frameworks;
|
||||||
cp -r bin/firmware bin/Labrador.app/Contents/MacOS
|
cp -r bin/firmware bin/Labrador.app/Contents/MacOS;
|
||||||
cp -r bin/waveforms bin/Labrador.app/Contents/MacOS
|
cp -r bin/waveforms bin/Labrador.app/Contents/MacOS;
|
||||||
cp ../build_scripts/osx/iconfile.icns bin/Labrador.app/Contents/Resources
|
cp ../build_scripts/osx/iconfile.icns bin/Labrador.app/Contents/Resources;
|
||||||
cp ../build_scripts/osx/Info.plist bin/Labrador.app/Contents
|
cp ../build_scripts/osx/Info.plist bin/Labrador.app/Contents;
|
||||||
macdeployqt bin/Labrador.app -dmg -libpath=build_mac/libdfuprog/lib/
|
macdeployqt bin/Labrador.app -dmg -libpath=build_mac/libdfuprog/lib/;
|
||||||
#Linux
|
#Linux
|
||||||
elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
|
elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
|
||||||
cd Desktop_Interface
|
cd Desktop_Interface;
|
||||||
qmake CONFIG+=release PREFIX=/usr
|
qmake CONFIG+=release PREFIX=/usr;
|
||||||
make -j$(nproc)
|
make -j$(nproc);
|
||||||
# - make INSTALL_ROOT=appdir -j$(nproc) install ; find appdir/
|
# - make INSTALL_ROOT=appdir -j$(nproc) install ; find appdir/
|
||||||
# NOTE: The following 5 lines should not be needed if "make install" would be made work for Labrador; see
|
# NOTE: The following 5 lines should not be needed if "make install" would be made work for Labrador; see
|
||||||
# https://github.com/probonopd/linuxdeployqt#using-linuxdeployqt-with-travis-ci
|
# https://github.com/probonopd/linuxdeployqt#using-linuxdeployqt-with-travis-ci
|
||||||
sudo cp ./build_linux/libdfuprog/lib/x64/libdfuprog-*.so /usr/lib/x86_64-linux-gnu/
|
sudo cp ./build_linux/libdfuprog/lib/x64/libdfuprog-*.so /usr/lib/x86_64-linux-gnu/;
|
||||||
mkdir -p appdir/usr/bin/ ; ldd bin/Labrador ; strip bin/Labrador ; cp bin/Labrador appdir/usr/bin/
|
mkdir -p appdir/usr/bin/ ; ldd bin/Labrador ; strip bin/Labrador ; cp bin/Labrador appdir/usr/bin/;
|
||||||
cp -r bin/{waveforms,firmware} appdir/usr/bin/
|
cp -r bin/{waveforms,firmware} appdir/usr/bin/;
|
||||||
mkdir -p appdir/usr/share/applications ; cp build_linux/labrador.desktop appdir/usr/share/applications
|
mkdir -p appdir/usr/share/applications ; cp build_linux/labrador.desktop appdir/usr/share/applications;
|
||||||
mkdir -p appdir/usr/share/icons/hicolor/256x256/apps/ ; cp '../build_scripts/linux_deploy_labra_64-bit/labradeb/usr/share/app-install/icons/espotek-labrador.png' appdir/usr/share/icons/hicolor/256x256/apps/
|
mkdir -p appdir/usr/share/icons/hicolor/256x256/apps/ ; cp '../build_scripts/linux_deploy_labra_64-bit/labradeb/usr/share/app-install/icons/espotek-labrador.png' appdir/usr/share/icons/hicolor/256x256/apps/;
|
||||||
wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
|
wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage";
|
||||||
chmod a+x linuxdeployqt-continuous-x86_64.AppImage
|
chmod a+x linuxdeployqt-continuous-x86_64.AppImage;
|
||||||
unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
|
unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH;
|
||||||
export VERSION=$(git rev-parse --short HEAD)
|
export VERSION=$(git rev-parse --short HEAD);
|
||||||
./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/share/applications/*.desktop -bundle-non-qt-libs -verbose=2
|
./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/share/applications/*.desktop -bundle-non-qt-libs -verbose=2;
|
||||||
./linuxdeployqt*.AppImage --appimage-extract
|
./linuxdeployqt*.AppImage --appimage-extract;
|
||||||
rm ./appdir/AppRun ; cp ./build_linux/AppRun appdir/ ; chmod a+x ./appdir/AppRun
|
rm ./appdir/AppRun ; cp ./build_linux/AppRun appdir/ ; chmod a+x ./appdir/AppRun;
|
||||||
PATH=./squashfs-root/usr/bin:$PATH ./squashfs-root/usr/bin/appimagetool -g ./appdir/
|
PATH=./squashfs-root/usr/bin:$PATH ./squashfs-root/usr/bin/appimagetool -g ./appdir/;
|
||||||
fi
|
fi
|
||||||
|
|
||||||
after_success:
|
after_success:
|
||||||
# OSX
|
# OSX
|
||||||
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
|
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
|
||||||
wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
|
wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh;
|
||||||
bash upload.sh Labrador.dmg
|
bash upload.sh Labrador.dmg;
|
||||||
# Linux
|
# Linux
|
||||||
elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
|
elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
|
||||||
find appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq
|
find appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq;
|
||||||
# curl --upload-file EspoTek_Labrador*.AppImage https://transfer.sh/EspoTek_Labrador-git.$(git rev-parse --short HEAD)-x86_64.AppImage
|
# curl --upload-file EspoTek_Labrador*.AppImage https://transfer.sh/EspoTek_Labrador-git.$(git rev-parse --short HEAD)-x86_64.AppImage
|
||||||
wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
|
wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh;
|
||||||
bash upload.sh EspoTek_Labrador*.AppImage*
|
bash upload.sh EspoTek_Labrador*.AppImage*;
|
||||||
fi
|
fi
|
||||||
|
|
||||||
branches:
|
branches:
|
||||||
|
|
Loading…
Reference in New Issue