Additional work to hopefully make all three platforms build properly with TravisCI

This commit is contained in:
Collin Kidder
2019-08-07 18:49:33 -04:00
parent ad24aa4fd3
commit 1c11927481
+3 -2
View File
@@ -52,7 +52,7 @@ matrix:
provider: releases provider: releases
skip_cleanup: true skip_cleanup: true
api_key: $GITHUB_TOKEN api_key: $GITHUB_TOKEN
file: SavvyCAN.dmg file: Release/SavvyCAN.dmg
on: on:
branch: WIP branch: WIP
draft: true draft: true
@@ -60,10 +60,11 @@ matrix:
- os: windows - os: windows
before_install: before_install:
- cmd.exe /C 'cd && "C:/Program Files (x86)/Microsoft Visual Studio/2017/BuildTools/VC/Auxiliary/Build/vcvars32.bat"' - cmd.exe /C 'cd && "C:/Program Files (x86)/Microsoft Visual Studio/2017/BuildTools/VC/Auxiliary/Build/vcvars32.bat"'
- choco install zip
- 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' - 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:/Qt/5.12.3/msvc2017/bin/windeployqt.exe" ./SavvyCAN.exe' - cmd.exe /C 'cd && "C:/Qt/5.12.3/msvc2017/bin/windeployqt.exe" ./SavvyCAN.exe'
- rm *.cpp - rm *.cpp
- rm *.h - rm *.h