Attempt to fix windows compiling in TravisCI

This commit is contained in:
Collin Kidder
2019-08-07 19:14:36 -04:00
parent 1c11927481
commit f87f229051
+50 -48
View File
@@ -2,60 +2,60 @@ language: cpp
matrix: matrix:
include: include:
- os: linux # - os: linux
dist: xenial # dist: xenial
compiler: gcc # compiler: gcc
sudo: require # sudo: require
before_install: # before_install:
- sudo add-apt-repository ppa:beineri/opt-qt-5.12.3-xenial -y # - sudo add-apt-repository ppa:beineri/opt-qt-5.12.3-xenial -y
- sudo apt-get update -qq # - sudo apt-get update -qq
install: # install:
- sudo apt-get -y install qt512base qt512connectivity qt512imageformats qt512serialport qt512serialbus qt512doc qt512tools libgl1-mesa-dev # - sudo apt-get -y install qt512base qt512connectivity qt512imageformats qt512serialport qt512serialbus qt512doc qt512tools libgl1-mesa-dev
- source /opt/qt*/bin/qt*-env.sh # - source /opt/qt*/bin/qt*-env.sh
script: # script:
- 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/
- 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
# export VERSION=... # linuxdeployqt uses this for naming the file # # 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 # 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 # 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* # - bash upload.sh SavvyCAN*.AppImage*
deploy: # deploy:
provider: releases # provider: releases
skip_cleanup: true # skip_cleanup: true
api_key: $GITHUB_TOKEN # api_key: $GITHUB_TOKEN
file_glob: true # file_glob: true
file: SavvyCAN*.AppImage # file: SavvyCAN*.AppImage
on: # on:
branch: WIP # branch: WIP
draft: true # draft: true
- os: osx # - os: osx
osx_image: xcode10 # osx_image: xcode10
before_install: # before_install:
- brew install qt5 # - brew install qt5
- brew link qt5 --force # - brew link qt5 --force
script: # script:
- qmake CONFIG+=release -spec macx-xcode SavvyCAN.pro # - qmake CONFIG+=release -spec macx-xcode SavvyCAN.pro
- xcodebuild # - xcodebuild
- macdeployqt Release/SavvyCAN.app -dmg # - macdeployqt Release/SavvyCAN.app -dmg
deploy: # deploy:
provider: releases # provider: releases
skip_cleanup: true # skip_cleanup: true
api_key: $GITHUB_TOKEN # api_key: $GITHUB_TOKEN
file: Release/SavvyCAN.dmg # file: Release/SavvyCAN.dmg
on: # on:
branch: WIP # branch: WIP
draft: true # draft: true
- os: windows - os: windows
before_install: before_install:
@@ -64,8 +64,10 @@ matrix:
- curl -vLO http://download.qt.io/official_releases/online_installers/qt-unified-windows-x86-online.exe - 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" - "./qt-unified-windows-x86-online.exe --verbose --script qt-installer-windows.qs"
script: 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 && cd release' - 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:/Qt/5.12.3/msvc2017/bin/windeployqt.exe" ./SavvyCAN.exe' - ls
- cmd.exe /C 'cd release && "C:/Qt/5.12.3/msvc2017/bin/windeployqt.exe" ./SavvyCAN.exe'
- ls
- rm *.cpp - rm *.cpp
- rm *.h - rm *.h
- rm *.obj - rm *.obj