Attempt to fix windows compiling in TravisCI

2019-08-07 19:14:36 -04:00
parent 1c11927481
commit f87f229051
1 changed files with 50 additions and 48 deletions
@@ -2,60 +2,60 @@ 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
-           # 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
+#        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

-        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
-           api_key: $GITHUB_TOKEN
-           file_glob: true
-           file: SavvyCAN*.AppImage
-           on:
-              branch: WIP
-           draft: true
+#        deploy:
+#           provider: releases
+#           skip_cleanup: true
+#           api_key: $GITHUB_TOKEN
+#           file_glob: true
+#           file: SavvyCAN*.AppImage
+#           on:
+#              branch: WIP
+#           draft: true
  
-      - os: osx
-        osx_image: xcode10
-        before_install:
-           - brew install qt5
-           - brew link qt5 --force
-        script:
-           - qmake CONFIG+=release -spec macx-xcode SavvyCAN.pro
-           - xcodebuild
-           - macdeployqt Release/SavvyCAN.app -dmg
-        deploy:
-           provider: releases
-           skip_cleanup: true
-           api_key: $GITHUB_TOKEN
-           file: Release/SavvyCAN.dmg
-           on:
-              branch: WIP
-           draft: true
+#      - os: osx
+#        osx_image: xcode10
+#        before_install:
+#           - brew install qt5
+#           - brew link qt5 --force
+#        script:
+#           - qmake CONFIG+=release -spec macx-xcode SavvyCAN.pro
+#           - xcodebuild
+#           - macdeployqt Release/SavvyCAN.app -dmg
+#        deploy:
+#           provider: releases
+#           skip_cleanup: true
+#           api_key: $GITHUB_TOKEN
+#           file: Release/SavvyCAN.dmg
+#           on:
+#              branch: WIP
+#           draft: true

      - os: windows
        before_install:
@@ -64,8 +64,10 @@ 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 && cd release'
-           - cmd.exe /C 'cd && "C:/Qt/5.12.3/msvc2017/bin/windeployqt.exe" ./SavvyCAN.exe'
+           - 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'
+           - ls
+           - cmd.exe /C 'cd release && "C:/Qt/5.12.3/msvc2017/bin/windeployqt.exe" ./SavvyCAN.exe'
+           - ls
           - rm *.cpp
           - rm *.h
           - rm *.obj