pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

try to fix builds

Browse source
This commit is contained in:
Martin Rotter 2021-05-28 07:13:40 +02:00
parent 8e2dd0d47b
commit 17927eab8c
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
resources/scripts/github-actions/build-linux-mac.sh
View file

@ -17,18 +17,18 @@ 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:beineri/opt-qt-5.15.2-xenial -y
sudo apt-get update
sudo apt-get -y install gcc-7 g++-7 qt514tools qt514base qt514webengine qt514svg
sudo apt-get -y install gcc-9 g++-9 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 --install /usr/bin/gcc gcc /usr/bin/gcc-9 50
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-9 50
source /opt/qt514/bin/qt514-env.sh
source /opt/qt515/bin/qt515-env.sh
else
pip3 install aqtinstall
@ -39,7 +39,7 @@ else
echo "Qt bin directory is: $QTBIN"
echo "Qt will be installed to: $QTPATH"
aqt install -O "$QTPATH" 5.15.2 mac desktop clang_64 -m qtwebengine
aqt install -O "$QTPATH" "5.15.2" "mac" "desktop" "clang_64" -m "qtwebengine" "qtmultimedia"
export QT_PLUGIN_PATH="$QTPATH/$QTVERSION/clang_64/plugins"
export PATH="$QTBIN:$PATH"

2
resources/scripts/github-actions/build-windows.ps1
View file

@ -36,7 +36,7 @@ Invoke-WebRequest -Uri "$maria_link" -OutFile "$maria_output"
# Download Qt itself.
$qt_path = "$old_pwd\qt"
pip3 install aqtinstall
aqt install -b "https://mirrors.ocf.berkeley.edu/qt/" -O "$qt_path" "$qt_version" "windows" "desktop" "win64_msvc2019_64" -m "qtwebengine" -m "qtmultimedia"
aqt install -b "https://mirrors.ocf.berkeley.edu/qt/" -O "$qt_path" "$qt_version" "windows" "desktop" "win64_msvc2019_64" -m "qtwebengine" "qtmultimedia"
$qt_qmake = "$qt_path\$qt_version\msvc2019_64\bin\qmake.exe"
$env:PATH = "$qt_path\$qt_version\msvc2019_64\bin\;" + $env:PATH