From ab04a9ada391d84bb3972634197a6795aaae8432 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Thu, 26 Nov 2020 13:00:37 +0100 Subject: [PATCH] Give up, too complex rn. --- .travis.yml | 3 --- resources/scripts/.travis-before-install.sh | 11 ----------- resources/scripts/.travis-install-windows.sh | 6 ------ 3 files changed, 20 deletions(-) delete mode 100755 resources/scripts/.travis-install-windows.sh diff --git a/.travis.yml b/.travis.yml index fe2c7cf86..5f67e9e6f 100755 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ dist: xenial os: - linux - osx -- windows env: - USE_WEBENGINE=false - USE_WEBENGINE=true @@ -41,5 +40,3 @@ script: ; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./resources/scripts/.travis-install-osx.sh ; fi -- if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then ./resources/scripts/.travis-install-windows.sh - ; fi \ No newline at end of file diff --git a/resources/scripts/.travis-before-install.sh b/resources/scripts/.travis-before-install.sh index 1d2c9a443..f53baa4ff 100755 --- a/resources/scripts/.travis-before-install.sh +++ b/resources/scripts/.travis-before-install.sh @@ -27,15 +27,4 @@ elif test "$TRAVIS_OS_NAME" = "linux"; then sudo update-alternatives --remove-all g++ sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 50 sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-7 50 -else - git submodule update --init --recursive --remote - qt_version="5.15.1" - qt_stub="qt-$qt_version-dynamic-msvc2019-x86_64" - qt_link="https://github.com/martinrotter/qt5-minimalistic-builds/releases/download/$qt_version/$qt_stub.7z" - qt_output="qt.7z" - - curl -L $qt_link --output $qt_output - "./resources/scripts/7za/7za.exe" x $qt_output - qt_bin=$(dirname $(readlink -f $(find ./ -name "qmake.exe"))) - export PATH="$qt_bin:$PATH" fi \ No newline at end of file diff --git a/resources/scripts/.travis-install-windows.sh b/resources/scripts/.travis-install-windows.sh deleted file mode 100755 index 1106cac12..000000000 --- a/resources/scripts/.travis-install-windows.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -echo $PATH - -# Build application. -qmake .. "USE_WEBENGINE=$USE_WEBENGINE"