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

try to fix aqt mirrors, use defaults

Browse source
This commit is contained in:
Martin Rotter 2025-04-17 06:48:31 +02:00
parent eb8d258a09
commit 9d212c7063
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -69,9 +69,9 @@ else
echo "Qt will be installed to: $QTPATH" echo "Qt will be installed to: $QTPATH"
# Install Qt. # Install Qt.
aqt -c 'aqt/settings.ini' install-qt -O "$QTPATH" "$QTTARGET" "desktop" "$QTVERSION" "$QTARCH" -m "qtwebengine" "qtimageformats" "qtwebchannel" "qtmultimedia" "qt5compat" "qtpositioning" "qtserialport" aqt install-qt -O "$QTPATH" "$QTTARGET" "desktop" "$QTVERSION" "$QTARCH" -m "qtwebengine" "qtimageformats" "qtwebchannel" "qtmultimedia" "qt5compat" "qtpositioning" "qtserialport"
aqt -c 'aqt/settings.ini' install-tool -O "$QTPATH" "$QTTARGET" "desktop" "tools_cmake" aqt install-tool -O "$QTPATH" "$QTTARGET" "desktop" "tools_cmake"
aqt -c 'aqt/settings.ini' install-tool -O "$QTPATH" "$QTTARGET" "desktop" "tools_ninja" aqt install-tool -O "$QTPATH" "$QTTARGET" "desktop" "tools_ninja"
export QT_PLUGIN_PATH="$QTPATH/$QTVERSION/$QTOS/plugins" export QT_PLUGIN_PATH="$QTPATH/$QTVERSION/$QTOS/plugins"
export PATH="$QTBIN:$QTPATH/Tools/CMake/CMake.app/Contents/bin:$QTPATH/Tools/Ninja:$PATH" export PATH="$QTBIN:$QTPATH/Tools/CMake/CMake.app/Contents/bin:$QTPATH/Tools/Ninja:$PATH"
@ -144,7 +144,7 @@ else
otool -L "$prefix/Contents/MacOS/rssguard" otool -L "$prefix/Contents/MacOS/rssguard"
# Try to self-sign the app. # Try to self-sign the app.
codesign -v --deep -fs - "$prefix" #codesign -v --deep -fs - "$prefix"
# Deploy to DMG. # Deploy to DMG.
macdeployqt "$prefix" -dmg macdeployqt "$prefix" -dmg

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

@ -106,20 +106,20 @@ pip3 install -U pip
pip3 install -I git+https://github.com/miurahr/aqtinstall pip3 install -I git+https://github.com/miurahr/aqtinstall
if ($is_qt_6) { if ($is_qt_6) {
aqt -c 'aqt\settings.ini' install-qt -O "$qt_path" windows desktop $qt_version $qt_arch -m qtwebengine qtimageformats qtmultimedia qt5compat qtwebchannel qtpositioning aqt install-qt -O "$qt_path" windows desktop $qt_version $qt_arch -m qtwebengine qtimageformats qtmultimedia qt5compat qtwebchannel qtpositioning
} }
else { else {
aqt -c 'aqt\settings.ini' install-qt -O "$qt_path" windows desktop $qt_version $qt_arch -m qtwebengine aqt install-qt -O "$qt_path" windows desktop $qt_version $qt_arch -m qtwebengine
} }
aqt -c 'aqt\settings.ini' install-src -O "$qt_path" windows desktop $qt_version --archives qtbase aqt install-src -O "$qt_path" windows desktop $qt_version --archives qtbase
$qt_qmake = "$qt_path\$qt_version\$qt_arch_base\bin\qmake.exe" $qt_qmake = "$qt_path\$qt_version\$qt_arch_base\bin\qmake.exe"
$env:PATH = "$qt_path\$qt_version\$qt_arch_base\bin\;" + $env:PATH $env:PATH = "$qt_path\$qt_version\$qt_arch_base\bin\;" + $env:PATH
if ($is_qt_6) { if ($is_qt_6) {
# Download openssl 3.x. # Download openssl 3.x.
aqt -c 'aqt\settings.ini' install-tool -O "$qt_path" windows desktop tools_opensslv3_x64 qt.tools.opensslv3.win_x64 aqt install-tool -O "$qt_path" windows desktop tools_opensslv3_x64 qt.tools.opensslv3.win_x64
$openssl_base_path = "$qt_path\Tools\OpenSSLv3\Win_x64" $openssl_base_path = "$qt_path\Tools\OpenSSLv3\Win_x64"
} }
else { else {