diff --git a/.travis.yml b/.travis.yml index 93f6b8ee2..79dad1c8e 100755 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: cpp -osx_image: xcode7.3 +osx_image: xcode9.4 sudo: required -dist: trusty +dist: xenial os: - linux - osx diff --git a/resources/binaries b/resources/binaries index e720ebcd6..6bd7ec93a 160000 --- a/resources/binaries +++ b/resources/binaries @@ -1 +1 @@ -Subproject commit e720ebcd6f9c146c3582e975fb24b5d93315b9bc +Subproject commit 6bd7ec93a76a14de24f9dbb8570b4d68eb4b27be diff --git a/resources/scripts/.appveyor-install-win.ps1 b/resources/scripts/.appveyor-install-win.ps1 index 01b484efb..0aa1b2267 100755 --- a/resources/scripts/.appveyor-install-win.ps1 +++ b/resources/scripts/.appveyor-install-win.ps1 @@ -27,7 +27,7 @@ $wikiline = "| Windows | $date | [$git_revision](https://github.com/martinrotter (Get-Content $wikifile) -replace $regex, $wikiline | Set-Content -Encoding "utf8" $wikifile -$file = (Get-ChildItem '*.exe').Name +$file = (Get-ChildItem '*-win64.exe').Name echo "File to upload: $file" $url = curl.exe --upload-file "$file" "https://transfer.sh/$file" --silent echo "Obtained URL: $url" diff --git a/resources/scripts/.travis-before-install.sh b/resources/scripts/.travis-before-install.sh index 7322ed8f8..d660c7ef4 100755 --- a/resources/scripts/.travis-before-install.sh +++ b/resources/scripts/.travis-before-install.sh @@ -14,7 +14,15 @@ if test "$TRAVIS_OS_NAME" = "osx"; then brew link --force gnu-sed else # Linux. - sudo add-apt-repository ppa:beineri/opt-qt591-trusty -y + sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y + sudo add-apt-repository ppa:beineri/opt-qt-5.12.2-xenial -y + sudo apt-get update - sudo apt-get -y install qt59tools qt59base qt59webengine + sudo apt-get -y install gcc-7 g++-7 qt512tools qt512base qt512webengine qt512svg + sudo apt-get -y install openssl libssl-dev libgl1-mesa-dev + + sudo update-alternatives --remove-all gcc + 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 fi \ No newline at end of file diff --git a/resources/scripts/.travis-install-linux.sh b/resources/scripts/.travis-install-linux.sh index 513b8feb4..7ec9f2ffb 100755 --- a/resources/scripts/.travis-install-linux.sh +++ b/resources/scripts/.travis-install-linux.sh @@ -1,7 +1,7 @@ #!/bin/bash # Setup Qt build environment. -source /opt/qt59/bin/qt59-env.sh +source /opt/qt512/bin/qt512-env.sh mkdir rssguard-build && cd rssguard-build # Build application.