Add deploy to linux commands, try once again to fix windows

This commit is contained in:
Collin Kidder
2019-08-06 20:44:39 -04:00
parent 8d583f00de
commit 04ff73462c
+30 -20
View File
@@ -2,32 +2,42 @@ language: cpp
matrix:
include:
# - os: linux
# dist: xenial
# compiler: gcc
# sudo: require
# before_install:
# - sudo add-apt-repository ppa:beineri/opt-qt-5.12.3-xenial -y
# - sudo apt-get update -qq
- os: linux
dist: xenial
compiler: gcc
sudo: require
before_install:
- sudo add-apt-repository ppa:beineri/opt-qt-5.12.3-xenial -y
- sudo apt-get update -qq
# install:
# - sudo apt-get -y install qt512base qt512connectivity qt512imageformats qt512serialport qt512serialbus qt512doc qt512tools libgl1-mesa-dev
# - source /opt/qt*/bin/qt*-env.sh
install:
- sudo apt-get -y install qt512base qt512connectivity qt512imageformats qt512serialport qt512serialbus qt512doc qt512tools libgl1-mesa-dev
- source /opt/qt*/bin/qt*-env.sh
# script:
# - qmake CONFIG+=release PREFIX=/usr
# - make -j$(nproc)
# - make INSTALL_ROOT=appdir -j$(nproc) install ; find appdir/
# - wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
# - chmod a+x linuxdeployqt-continuous-x86_64.AppImage
script:
- qmake CONFIG+=release PREFIX=/usr
- make -j$(nproc)
- make INSTALL_ROOT=appdir -j$(nproc) install ; find appdir/
- wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
- chmod a+x linuxdeployqt-continuous-x86_64.AppImage
# export VERSION=... # linuxdeployqt uses this for naming the file
# - ./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/local/share/applications/SavvyCAN.desktop -appimage -extra-plugins=iconengines,platformthemes.libqgtk3.so
- ./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/local/share/applications/SavvyCAN.desktop -appimage -extra-plugins=iconengines,platformthemes.libqgtk3.so
# after_success:
after_success:
# find appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq # for debugging
# curl --upload-file APPNAME*.AppImage https://transfer.sh/APPNAME-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 SavvyCAN*.AppImage*
deploy:
provider: releases
skip_cleanup: true
github_token: $GITHUB_TOKEN
file_glob: true
file: SavvyCAN*.AppImage
# on:
# branch: master
draft: true
# - os: osx
# osx_image: xcode10
@@ -44,7 +54,7 @@ matrix:
- curl -vLO http://download.qt.io/official_releases/online_installers/qt-unified-windows-x86-online.exe
- "./qt-unified-windows-x86-online.exe --verbose --script qt-installer-windows.qs"
script:
- cmd.exe /C 'cd && "C:/Program Files (x86)/Microsoft Visual Studio/2017/BuildTools/VC/Auxiliary/Build/vcvars32.bat" && cd && "C:/Qt/5.12.3/msvc2017/bin/qmake CONFIG+=RELEASE SavvyCAN.pro" && cd && nmake'
- cmd.exe /C 'cd && "C:/Program Files (x86)/Microsoft Visual Studio/2017/BuildTools/VC/Auxiliary/Build/vcvars32.bat" && cd && "C:/Qt/5.12.3/msvc2017/bin/qmake" CONFIG+=RELEASE SavvyCAN.pro && cd && nmake'
branches:
except: