try to fix travis and appveyor

This commit is contained in:
Martin Rotter 2019-04-03 10:07:18 +02:00
parent f370d78560
commit 4a857ae99f
5 changed files with 15 additions and 7 deletions

View file

@ -1,7 +1,7 @@
language: cpp language: cpp
osx_image: xcode7.3 osx_image: xcode9.4
sudo: required sudo: required
dist: trusty dist: xenial
os: os:
- linux - linux
- osx - osx

@ -1 +1 @@
Subproject commit e720ebcd6f9c146c3582e975fb24b5d93315b9bc Subproject commit 6bd7ec93a76a14de24f9dbb8570b4d68eb4b27be

View file

@ -27,7 +27,7 @@ $wikiline = "| Windows | $date | [$git_revision](https://github.com/martinrotter
(Get-Content $wikifile) -replace $regex, $wikiline | Set-Content -Encoding "utf8" $wikifile (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" echo "File to upload: $file"
$url = curl.exe --upload-file "$file" "https://transfer.sh/$file" --silent $url = curl.exe --upload-file "$file" "https://transfer.sh/$file" --silent
echo "Obtained URL: $url" echo "Obtained URL: $url"

View file

@ -14,7 +14,15 @@ if test "$TRAVIS_OS_NAME" = "osx"; then
brew link --force gnu-sed brew link --force gnu-sed
else else
# Linux. # 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 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 fi

View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# Setup Qt build environment. # Setup Qt build environment.
source /opt/qt59/bin/qt59-env.sh source /opt/qt512/bin/qt512-env.sh
mkdir rssguard-build && cd rssguard-build mkdir rssguard-build && cd rssguard-build
# Build application. # Build application.