Skip to content

Commit

Permalink
try to adapt to app update 2.2.0 with QT 6.7.2 and openssl 3.3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
chcg committed Jul 5, 2024
1 parent 5119ef3 commit dfb0542
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 10 deletions.
9 changes: 4 additions & 5 deletions .github/workflows/CI_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -29,7 +29,7 @@ jobs:
- name: Install Qt
uses: jurplel/install-qt-action@v3
with:
version: '6.5.*'
version: '6.7.*'
modules: 'qtscxml qtwebsockets qtshadertools qtconnectivity qtimageformats'
setup-python: 'false'

Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
- name: Install Qt
uses: jurplel/install-qt-action@v3
with:
version: '6.5.*'
version: '6.7.*'
modules: 'qtscxml qtwebsockets qtshadertools qtconnectivity'
setup-python: 'false'

Expand All @@ -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
Expand All @@ -99,7 +98,7 @@ jobs:
- name: Install Qt
uses: jurplel/install-qt-action@v3
with:
version: '6.5.2'
version: '6.7.*'
modules: 'qtscxml qtwebsockets qtshadertools qtconnectivity qtimageformats'
setup-python: 'false'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
- name: Install Qt
uses: jurplel/install-qt-action@v3
with:
version: '6.5.*'
version: '6.7.*'
modules: 'qtscxml qtwebsockets qtshadertools qtconnectivity'
setup-python: 'false'

Expand Down
8 changes: 4 additions & 4 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit dfb0542

Please sign in to comment.