Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .github/workflows/ci-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,15 @@ jobs:

- name: Cache Qt
id: cache-qt
uses: actions/cache@v1 # not v2!
uses: actions/cache@v4
with:
path: ../Qt
key: ${{ runner.os }}-QtCache-6.5
key: ${{ runner.os }}-QtCache-6.8

- name: Install Qt
uses: jurplel/install-qt-action@v3
with:
version: 6.5.3
version: 6.8.3
target: desktop
modules: 'qtwebengine qtwebchannel qtpositioning qtpdf qtimageformats qt5compat qtserialport'
tools: 'tools_opensslv3_src'
Expand Down Expand Up @@ -114,6 +114,8 @@ jobs:

- name: Build Project
run: |
# Remove the libqsqlmimer.so as libmimerapi.so is not deployed with Qt6
rm ${{runner.workspace}}/Qt/6.*/gcc_64/plugins/sqldrivers/libqsqlmimer.so
cmake --build . --target pack
working-directory: ${{runner.workspace}}/build

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- name: "Build on Arm64"
os: macos-latest
arch: universal
qt: 6.5.3
qt: 6.8.3

runs-on: ${{matrix.config.os}}

Expand Down Expand Up @@ -81,10 +81,10 @@ jobs:

- name: Cache Qt
id: cache-qt
uses: actions/cache@v1 # not v2!
uses: actions/cache@v4
with:
path: ../Qt
key: ${{ runner.os }}-QtCache-6.5
key: ${{ runner.os }}-QtCache-6.8

- name: Install Qt
uses: jurplel/install-qt-action@v3
Expand Down
16 changes: 10 additions & 6 deletions .github/workflows/ci-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ env:
jobs:
build:
name: ${{ matrix.config.name }}
runs-on: windows-2019
runs-on: windows-${{ matrix.config.vs_version }}
timeout-minutes: 120

strategy:
Expand All @@ -30,14 +30,18 @@ jobs:
config:
- name: "Build on Win64 Qt 5.15"
arch: win64_msvc2019_64
vs_version: 2019
vs_cmd: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\VC\\Auxiliary\\Build\\vcvars64.bat"
qt: 5.15.2
qt_modules: qtwebengine
qt_tools: tools_opensslv3_x64
qt_major: 5
suffix: "-windows7"
- name: "Build on Win64 Qt 6.5"
arch: win64_msvc2019_64
qt: 6.5.3
- name: "Build on Win64 Qt 6"
arch: win64_msvc2022_64
vs_version: 2022
vs_cmd: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Auxiliary\\Build\\vcvars64.bat"
qt: 6.8.3
qt_modules: "qtwebengine qtwebchannel qtpositioning qtpdf qtimageformats qt5compat"
qt_tools: tools_opensslv3_x64
qt_major: 6
Expand All @@ -58,7 +62,7 @@ jobs:

- name: Cache Qt
id: cache-qt
uses: actions/cache@v1 # not v2!
uses: actions/cache@v4
with:
path: ../Qt
key: ${{runner.os}}-${{matrix.config.arch}}-QtCache-${{matrix.config.qt}}
Expand Down Expand Up @@ -94,7 +98,7 @@ jobs:
shell: cmd
run: |
cmake --version
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
call "${{matrix.config.vs_cmd}}"
cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DQT_DEFAULT_MAJOR_VERSION=${{matrix.config.qt_major}} -DOPENSSL_EXTRA_LIB_DIR=${{runner.workspace}}\build\openssl-utils.git\1.1.1j\Win_x64 %GITHUB_WORKSPACE%
cmake --build .
cmake --build . --target=pack
Expand Down
Loading