Merge remote-tracking branch 'fc/develop' into stdevMauricio1802_Tryi…

…ng_to_build_in_windows_using_msys2

.travis.yml

@@ -49,6 +49,32 @@ matrix:
         - make run-docker CMD='make test'
         - make lint
         - make run-docker CMD='make install-coveralls ; make test-cover-travis'
+# FIXME: Restore Windows builds
+#    - stage: Windows
+#      os: windows
+#      env:
+#        - QT5_BASE_DIR: C:/Qt/5.13.0/msvc2017
+#        - QT_DIR: C:/Qt
+#        - QT_QMAKE_DIR: C:/Qt/5.13.0/mingw73_64/bin
+#      install:
+#        - choco install make -y
+#        - choco install unzip -y
+#        #- df -h
+#        #- .travis/install-qt-win.sh
+#        #- df -h
+#        #- ls C:/Qt
+#        #- ls C:/Qt/5.13.0
+#        #- ls C:/Qt/5.13.0/mingw73_64
+#        #- ls C:/Qt/5.13.0/mingw73_64/bin
+#        - travis_wait 50 make install-deps-Windows
+#        - df -h
+#        - make install-linters
+#        - make install-coveralls
+#      script:
+#        - make build
+#        - make test
+#        - make build-icon
+#        - make test-cover-travis
     - stage: MacOS
       os: osx
       osx_image: xcode10.2

Makefile

@@ -130,7 +130,8 @@ install-deps-Darwin: ## Install osx dependencies
 install-deps-Windows: ## Install Windowns dependencies
 	set GO111MODULE=off
 	go get -v -tags=no_env github.com/therecipe/qt/cmd/...
-	(qtsetup -test=false)
+	@echo "Running qtsetup"
+	(qtsetup -test=false | true)
 	go get -t -d -v ./...
 	wget -O magick.zip https://sourceforge.net/projects/imagemagick/files/im7-exes/ImageMagick-7.0.7-25-portable-Q16-x64.zip
 	unzip magick.zip convert.exe