From be5bc5ff00c5ed546d98cbe61282ba57e912550a Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Fri, 25 Aug 2023 06:37:12 +0200 Subject: [PATCH] try to lower qt version --- .gitmodules | 9 --------- CMakeLists.txt | 2 +- resources/scripts/github-actions/build-windows.ps1 | 6 +++--- 3 files changed, 4 insertions(+), 13 deletions(-) delete mode 100755 .gitmodules diff --git a/.gitmodules b/.gitmodules deleted file mode 100755 index 8ccd48df4..000000000 --- a/.gitmodules +++ /dev/null @@ -1,9 +0,0 @@ -[submodule "resources/scripts/transka"] - path = resources/scripts/transka - url = https://github.com/martinrotter/transka.git -[submodule "resources/scripts/7za"] - path = resources/scripts/7za - url = https://github.com/martinrotter/7za.git -[submodule "resources/scripts/nsis"] - path = resources/scripts/nsis - url = https://github.com/martinrotter/nsis.git diff --git a/CMakeLists.txt b/CMakeLists.txt index a960786a3..17d829362 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,7 +67,7 @@ set(APP_AUTHOR "Martin Rotter") set(APP_COPYRIGHT "\\251 2011-${YEAR} ${APP_AUTHOR}") set(APP_REVERSE_NAME "io.github.martinrotter.rssguard") set(APP_DONATE_URL "https://github.com/sponsors/martinrotter") -set(APP_VERSION "4.5.0") +set(APP_VERSION "4.5.1") set(APP_URL "https://github.com/martinrotter/rssguard") set(APP_URL_DOCUMENTATION "https://github.com/martinrotter/rssguard/blob/${APP_VERSION}/resources/docs/Documentation.md") diff --git a/resources/scripts/github-actions/build-windows.ps1 b/resources/scripts/github-actions/build-windows.ps1 index 05684ab0e..e0a5a1561 100755 --- a/resources/scripts/github-actions/build-windows.ps1 +++ b/resources/scripts/github-actions/build-windows.ps1 @@ -24,13 +24,13 @@ if ($use_qt5 -eq "ON") { $qt_version = "5.15.2" } else { - $qt_version = "6.5.2" + $qt_version = "6.4.3" } -$maria_version = "10.6.14" +$maria_version = "10.6.15" $maria_link = "https://archive.mariadb.org/mariadb-$maria_version/winx64-packages/mariadb-$maria_version-winx64.zip" $maria_output = "maria.zip" -$cmake_version = "3.27.1" +$cmake_version = "3.27.4" $cmake_link = "https://github.com/Kitware/CMake/releases/download/v$cmake_version/cmake-$cmake_version-windows-x86_64.zip" $cmake_output = "cmake.zip"