From 7e7cbfa4ea753e592869754b7c3280ce03e437c5 Mon Sep 17 00:00:00 2001
From: borgmanJeremy <46930769+borgmanJeremy@users.noreply.github.com>
Date: Wed, 11 Jun 2025 16:43:38 -0500
Subject: [PATCH 1/2] Update Linux-pack.yml (#4001)

---
 .github/workflows/Linux-pack.yml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/Linux-pack.yml b/.github/workflows/Linux-pack.yml
index d6b9463bab..ba4cf66922 100644
--- a/.github/workflows/Linux-pack.yml
+++ b/.github/workflows/Linux-pack.yml
@@ -367,8 +367,8 @@ jobs:
 #           overwrite: true
 #
   flatpak-pack:
-    name: Build flatpak on ubuntu 22.04
-    runs-on: ubuntu-22.04
+    name: Build flatpak on ubuntu 24.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout Source code
         if: github.event_name == 'push'
@@ -428,8 +428,8 @@ jobs:
           overwrite: true
 
   snap-pack:
-    name: Build snap on ubuntu 22.04
-    runs-on: ubuntu-22.04
+    name: Build snap on ubuntu latest
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout Source code
         if: github.event_name == 'push'
@@ -459,8 +459,7 @@ jobs:
       - name: Packaging snap
         uses: snapcore/action-build@v1
         id: snapcraft
-        with: 
-          snapcraft-args: --enable-experimental-extensions
+
       - name: Rename snap name
         shell: bash
         run: |

From 100bfc1300872ecadf0eb3a72725bc3e5540bbb6 Mon Sep 17 00:00:00 2001
From: borgmanJeremy <46930769+borgmanJeremy@users.noreply.github.com>
Date: Wed, 11 Jun 2025 20:39:36 -0500
Subject: [PATCH 2/2] fixing windows CMAKE CI (#4004)

---
 .github/workflows/build_cmake.yml | 16 +++++++++++-----
 appveyor.yml                      | 12 ++++++------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml
index 86d2801d96..f1c8123658 100644
--- a/.github/workflows/build_cmake.yml
+++ b/.github/workflows/build_cmake.yml
@@ -95,7 +95,7 @@ jobs:
         - {
             name: "Windows 2022 MSVC",
             artifact: "Windows-MSVC.tar.xz",
-            os: windows-2025,
+            os: windows-2022,
             cc: "cl", cxx: "cl",
             environment_script: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat"
           }
@@ -103,19 +103,25 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Fix Python path
+        shell: pwsh
+        run: |
+          Remove-Item "$env:LOCALAPPDATA\Microsoft\WindowsApps\python*.exe" -Force -ErrorAction SilentlyContinue
+
       - name: Cache Qt
         id: cache-qt
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
-          path: ./build/Qt
-          key: ${{ runner.os }}-QtCache
+          path: ./build/Qt/6.9.1
+          key: ${{ runner.os }}-QtCache-6.9.1
 
       - name: Install Qt
         uses: jurplel/install-qt-action@v4
         with:
-          version: 6.8.*
+          version: 6.9.1
           target:  desktop
           dir: '${{ github.workspace }}/build/'
+          cached: ${{ steps.cache-qt.outputs.cache-hit }}
 
       - name: Configure
         working-directory: build
diff --git a/appveyor.yml b/appveyor.yml
index 8e4ea129a0..5d31aaa7e2 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,21 +1,21 @@
 image:
-  - Visual Studio 2019
+  - Visual Studio 2022
 clone_folder: c:\projects\source
 
 environment:
-  Qt5_INSTALL_DIR: 'C:\Qt\5.15.2\msvc2019_64'
-  PATH: '%Qt5_INSTALL_DIR%\bin;%PATH%'
+  Qt6_INSTALL_DIR: 'C:\Qt\6.8.1\msvc2022_64'
+  PATH: '%Qt6_INSTALL_DIR%\bin;%PATH%'
 
 build_script:
 - cmd: >-
 
-    set QTDIR=%Qt5_INSTALL_DIR%
+    set QTDIR=%Qt6_INSTALL_DIR%
 
-    set "VCINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC"
+    set "VCINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio\2022\Community\VC"
 
     set "OPENSSL_ROOT_DIR=C:/OpenSSL-v111-Win64"
 
-    cmake -S c:\projects\source -B build -G "Visual Studio 16 2019" -DCMAKE_BUILD_TYPE:STRING=Release -DENABLE_OPENSSL=ON -DRUN_IN_PLACE=OFF
+    cmake -S c:\projects\source -B build -G "Visual Studio 17 2022" -DCMAKE_BUILD_TYPE:STRING=Release -DENABLE_OPENSSL=ON -DRUN_IN_PLACE=OFF
 
     cmake --build build --parallel 2 --config "Release"