Set version to 2.2.2

kadas-albireo · Aug 28, 2023 · 4866548 · 4866548
1 parent 0464c31
commit 4866548
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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++ \