FreshRSS/rssguard
1
0
Fork 0
mirror of https://github.com/martinrotter/rssguard.git synced 2024-12-27 08:33:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

upgrate to ubuntu-18 as 16 is deprecated

Browse Source
This commit is contained in:
Martin Rotter 2021-09-08 07:06:28 +02:00
parent 6e10be3cdc
commit fedd1a6d08
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/rssguard.yml vendored
View File

@ -12,7 +12,7 @@ jobs:
runs-on: "${{ matrix.os }}"
strategy:
matrix:
os: [windows-2019, ubuntu-16.04, macos-10.15]
os: [windows-2019, ubuntu-18.04, macos-10.15]
use_webengine: ["true", "false"]
include:
- os: windows-2019

2
resources/desktop/com.github.rssguard.appdata.xml
View File

@ -26,7 +26,7 @@
<url type="donation">https://github.com/sponsors/martinrotter</url>
<content_rating type="oars-1.1" />
<releases>
<release version="4.0.0" date="2021-09-07"/>
<release version="4.0.0" date="2021-09-08"/>
</releases>
<content_rating type="oars-1.0">
<content_attribute id="violence-cartoon">none</content_attribute>

20
resources/scripts/github-actions/build-linux-mac.sh
View File

@ -16,19 +16,20 @@ echo "OS: $os; WebEngine: $webengine"
# Prepare environment.
if [ $is_linux = true ]; then
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
sudo add-apt-repository ppa:beineri/opt-qt-5.14.2-xenial -y
#sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
sudo add-apt-repository ppa:beineri/opt-qt-5.15.2-bionic -y
sudo apt-get update
sudo apt-get -y install gcc-7 g++-7 qt514tools qt514base qt514webengine qt514svg qt514multimedia
#sudo apt-get -y install gcc-7 g++-7
sudo apt-get -y install qt515tools qt515base qt515webengine qt515svg qt515multimedia
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
#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
source /opt/qt514/bin/qt514-env.sh
source /opt/qt515/bin/qt515-env.sh
else
pip3 install aqtinstall
@ -65,6 +66,7 @@ if [ $is_linux = true ]; then
# Create AppImage.
unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
./linuxdeployqt-continuous-x86_64.AppImage "./AppDir/usr/share/applications/com.github.rssguard.desktop" -bundle-non-qt-libs -no-translations
./linuxdeployqt-continuous-x86_64.AppImage "./AppDir/usr/share/applications/com.github.rssguard.desktop" -bundle-non-qt-libs -no-translations
if [[ "$webengine" == "true" ]]; then
# Copy some NSS3 files to prevent WebEngine crashes.