From d98b98a1e630e1de8a844ba3fa384891905db80e Mon Sep 17 00:00:00 2001 From: "Matthew J. Milner" Date: Thu, 5 Dec 2024 12:36:49 +0100 Subject: [PATCH 1/2] Update to latest Qt patch version and install-qt-action v4 in Qt6 Action Signed-off-by: Matthew J. Milner --- .github/workflows/build_qt6.yml | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build_qt6.yml b/.github/workflows/build_qt6.yml index c350049c49..11501f061b 100644 --- a/.github/workflows/build_qt6.yml +++ b/.github/workflows/build_qt6.yml @@ -7,7 +7,7 @@ name: Qt6 Build Matrix on: [push, pull_request, workflow_dispatch] env: - QT_VERSION: 6.8.0 + QT_VERSION: 6.8.1 # this is different from MACOSX_DEPLOYMENT_TARGET to prevent build problems # we set MACOSX_DEPLOYMENT_TARGET later MACOS_TARGET: 10.15 @@ -88,20 +88,9 @@ jobs: path: avogadrolibs - name: Install Qt - if: runner.os != 'Windows' - uses: jurplel/install-qt-action@v3 + uses: jurplel/install-qt-action@v4 with: version: ${{ env.QT_VERSION }} - aqtversion: '==3.1.*' - - - name: Install Qt (Windows) - if: runner.os == 'Windows' - uses: jurplel/install-qt-action@v3 - with: - version: ${{ env.QT_VERSION }} - aqtversion: '==3.1.*' - host: windows - arch: win64_msvc2022_64 - name: Configure MSVC Command Prompt if: runner.os == 'Windows' From 4be5f3089c6d5de7ca45b67413587682fd2a9ff9 Mon Sep 17 00:00:00 2001 From: "Matthew J. Milner" Date: Thu, 5 Dec 2024 15:20:28 +0100 Subject: [PATCH 2/2] Target macOS 12 with Qt6 Signed-off-by: Matthew J. Milner --- .github/workflows/build_qt6.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_qt6.yml b/.github/workflows/build_qt6.yml index 11501f061b..8cf14ea6fd 100644 --- a/.github/workflows/build_qt6.yml +++ b/.github/workflows/build_qt6.yml @@ -10,7 +10,7 @@ env: QT_VERSION: 6.8.1 # this is different from MACOSX_DEPLOYMENT_TARGET to prevent build problems # we set MACOSX_DEPLOYMENT_TARGET later - MACOS_TARGET: 10.15 + MACOS_TARGET: 12 FEATURES: -DBUILD_GPL_PLUGINS=ON -DBUILD_MOLEQUEUE=OFF -DWITH_COORDGEN=OFF -DUSE_VTK=ON -DQT_VERSION=6 jobs: