diff options
| author |  ctrlaltca | 2024-03-08 14:33:33 +0100 |
|---|---|---|
| committer |  GitHub | 2024-03-08 14:33:33 +0100 |
| commit | 27f96bbae96e8949e304ea86d41724a1bd3ede64 (patch) | |
| tree | 5e0da2f0836384b1188522a23e0da4da4f458ab9 /.github | |
| parent | Fix 2609; while we're at it, make the contextual help work again (#2610) (diff) | |
| download | KVIrc-27f96bbae96e8949e304ea86d41724a1bd3ede64.tar.gz KVIrc-27f96bbae96e8949e304ea86d41724a1bd3ede64.tar.bz2 KVIrc-27f96bbae96e8949e304ea86d41724a1bd3ede64.zip | |
Switching the mac CI to qt6 (#2612)
* try switching the mac CI to qt6; remove the cmake hardcoded deploy, use macdeployqt instead
* mac: Try to mode kvilib and modules to Contents/Frameworks for macdeployqt to pick them up
* Add Mattoje's patch
* Just disable python by now
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/build_linux_qt6.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/build_macos.yml | 14 | ||||
| -rw-r--r-- | .github/workflows/build_windows.yml | 2 |
3 files changed, 15 insertions, 3 deletions
diff --git a/.github/workflows/build_linux_qt6.yml b/.github/workflows/build_linux_qt6.yml index 2e23c1a0f..f958e19ce 100644 --- a/.github/workflows/build_linux_qt6.yml +++ b/.github/workflows/build_linux_qt6.yml @@ -27,7 +27,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v3 with: - version: 6.6.1 + version: 6.6.2 modules: qt5compat qtmultimedia - name: Install other prerequisites diff --git a/.github/workflows/build_macos.yml b/.github/workflows/build_macos.yml index b2afbce98..c78c37dd5 100644 --- a/.github/workflows/build_macos.yml +++ b/.github/workflows/build_macos.yml @@ -26,6 +26,9 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v3 + with: + version: 6.6.2 + modules: qt5compat qtmultimedia - name: Install other prerequisites run: | @@ -37,7 +40,11 @@ jobs: cd '${{github.workspace}}' mkdir build cd build - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER_LAUNCHER=ccache .. + cmake \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ + -DWANT_PYTHON=OFF \ + .. - name: Build run: | @@ -51,6 +58,11 @@ jobs: cd build cmake --install . + - name: Deployt Qt + run: | + cd '${{github.workspace}}' + macdeployqt "build/KVIrc.app" -appstore-compliant + - name: Detect version shell: bash run: | diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml index 85351754d..8e3c8152d 100644 --- a/.github/workflows/build_windows.yml +++ b/.github/workflows/build_windows.yml @@ -35,7 +35,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v3 with: - version: 6.6.1 + version: 6.6.2 modules: qt5compat qtmultimedia cache: true |