diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 79e1769c..eb923b6f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,14 +20,14 @@ jobs: run: dnf -y update - name: Install core dependencies - run: dnf -y install jq wget unzip 'dnf-command(download)' cpio + run: dnf5 -y install jq wget unzip 'dnf-command(download)' cpio - name: Install build dependencies run: ./scripts/mingwdeps.sh - name: Manually install qt5-qttranslations (FIXME?) run: | - dnf download mingw64-qt5-qttranslations + dnf5 download mingw64-qt5-qttranslations rpm2cpio mingw64-qt5-qttranslations*.rpm | cpio -idmv -D / - name: Version number diff --git a/CMakeLists.txt b/CMakeLists.txt index adac092b..98d022fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ SET(KADAS_NAME "Kadas" CACHE STRING "Kadas application name") SET(KADAS_FULL_NAME "Kadas Albireo" CACHE STRING "Kadas full application name") SET(KADAS_VERSION_MAJOR "2") SET(KADAS_VERSION_MINOR "2") -SET(KADAS_VERSION_PATCH "1") +SET(KADAS_VERSION_PATCH "2") SET(KADAS_VERSION_PRE "") EXECUTE_PROCESS(COMMAND git rev-parse HEAD OUTPUT_VARIABLE KADAS_VERSION_DEV OUTPUT_STRIP_TRAILING_WHITESPACE) diff --git a/scripts/mingwdeps.sh b/scripts/mingwdeps.sh index 79afcb86..72928768 100755 --- a/scripts/mingwdeps.sh +++ b/scripts/mingwdeps.sh @@ -2,7 +2,7 @@ wget -O /etc/yum.repos.d/smani-mingw-extras-fedora-rawhide.repo https://copr.fedorainfracloud.org/coprs/smani/mingw-extras/repo/fedora-rawhide/smani-mingw-extras-fedora-rawhide.repo && \ wget -O /etc/yum.repos.d/smani-osgearth-2.10-fedora-rawhide.repo https://copr.fedorainfracloud.org/coprs/smani/osgearth-2.10/repo/fedora-rawhide/smani-osgearth-2.10-fedora-rawhide.repo && \ -dnf install -y --disablerepo=*modular* \ +dnf5 install -y \ mingw64-dlfcn \ mingw64-exiv2 \ mingw64-gcc-c++ \