try to adapt to app update 2.2.0 with QT 6.7.2 and openssl 3.3.1

Governikus · Sep 11, 2024 · 2d1e225 · 2d1e225
1 parent a0a8c31
commit 2d1e225
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 15 deletions.
diff --git a/.github/workflows/CI_build.yml b/.github/workflows/CI_build.yml
@@ -17,7 +17,7 @@ jobs:
 
     - name: Install openssl dev
       run: |
-           choco install openssl --version=3.1.1
+           choco install openssl --version=3.3.1
            choco install ninja
 
     - name: Add nmake
@@ -27,9 +27,9 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Install Qt
-      uses: jurplel/install-qt-action@v3
+      uses: jurplel/install-qt-action@v4
       with:
-        version: '6.5.*'
+        version: '6.7.*'
         modules: 'qtscxml qtwebsockets qtshadertools qtconnectivity qtimageformats'
         setup-python: 'false'
 
@@ -64,9 +64,9 @@ jobs:
 
     # ubuntu 22.04 comes just with QT 6.2.4 and Qt >= 6.4 is required
     - name: Install Qt
-      uses: jurplel/install-qt-action@v3
+      uses: jurplel/install-qt-action@v4
       with:
-        version: '6.5.*'
+        version: '6.7.1'
         modules: 'qtscxml qtwebsockets qtshadertools qtconnectivity'
         setup-python: 'false'
 
@@ -83,7 +83,6 @@ jobs:
       run: |
            ctest --test-dir _build --output-on-failure -C "${{ matrix.build_configuration }}"
 
-  # due to https://bugreports.qt.io/browse/QTBUG-117765 QT 6.5.2 must be used instead of 6.5.3
   build_macos:
 
     runs-on: macos-latest
@@ -97,11 +96,10 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Install Qt
-      uses: jurplel/install-qt-action@v3
+      uses: jurplel/install-qt-action@v4
       with:
-        version: '6.5.2'
+        version: '6.7.1'
         modules: 'qtscxml qtwebsockets qtshadertools qtconnectivity qtimageformats'
-        setup-python: 'false'
 
     - name: generate cmake
       run: |

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -37,9 +37,9 @@ jobs:
 
       #QT > 6.4 is required but ubuntu 22.04 just has 6.2.4, so additional installation is needed
       - name: Install Qt
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
-          version: '6.5.*'
+          version: '6.7.1'
           modules: 'qtscxml qtwebsockets qtshadertools qtconnectivity'
           setup-python: 'false'
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -5,14 +5,14 @@ environment:
     - PlatformToolset: mingw-w64
       platform: mingw-w64
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
-      QTPath: C:\Qt\6.5\mingw_64
-      OPENSSLPath: C:\OpenSSL-v30-Win64\bin
+      QTPath: C:\Qt\6.7\mingw_64
+      OPENSSLPath: C:\OpenSSL-v33-Win64\bin
 
     - PlatformToolset: v142
       platform: x64
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
-      QTPath: C:\Qt\6.5\msvc2019_64
-      OPENSSLPath: C:\OpenSSL-v30-Win64\bin
+      QTPath: C:\Qt\6.7\msvc2019_64
+      OPENSSLPath: C:\OpenSSL-v33-Win64\bin
       ARCHI: amd64
 
 configuration: