From 9cadcbdb864b84ac926222e0a3b618db27b5be07 Mon Sep 17 00:00:00 2001 From: FX Coudert Date: Sat, 4 Nov 2023 20:17:45 +0100 Subject: [PATCH] ci: update workflow to Qt 6 on macOS (#6206) * Remove brew lines on Linux * Switch to Qt 6 on macOS --- .github/workflows/actions.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 596ac3309..a2590a2d8 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -245,7 +245,7 @@ jobs: run: brew install gtkmm3 - name: Get Dependencies (Qt) if: ${{ needs.what-to-make.outputs.make-qt == 'true' }} - run: brew install qt@5 + run: brew install qt - name: Get Source uses: actions/checkout@v3 with: @@ -260,7 +260,7 @@ jobs: -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_PREFIX=pfx \ -DCMAKE_OSX_ARCHITECTURES='x86_64' \ - -DCMAKE_PREFIX_PATH=`brew --prefix`/opt/qt@5 \ + -DCMAKE_PREFIX_PATH=`brew --prefix`/opt/qt \ -DENABLE_CLI=${{ (needs.what-to-make.outputs.make-cli == 'true') && 'ON' || 'OFF' }} \ -DENABLE_DAEMON=${{ (needs.what-to-make.outputs.make-daemon == 'true') && 'ON' || 'OFF' }} \ -DENABLE_GTK=${{ (needs.what-to-make.outputs.make-gtk == 'true') && 'ON' || 'OFF' }} \ @@ -336,7 +336,6 @@ jobs: -G Ninja \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_PREFIX=pfx \ - -DCMAKE_PREFIX_PATH=`brew --prefix`/opt/qt@5 \ -DENABLE_CLI=${{ (needs.what-to-make.outputs.make-cli == 'true') && 'ON' || 'OFF' }} \ -DENABLE_DAEMON=${{ (needs.what-to-make.outputs.make-daemon == 'true') && 'ON' || 'OFF' }} \ -DENABLE_GTK=${{ (needs.what-to-make.outputs.make-gtk == 'true') && 'ON' || 'OFF' }} \ @@ -518,7 +517,7 @@ jobs: run: brew install gtkmm3 - name: Get Dependencies (Qt) if: ${{ needs.what-to-make.outputs.make-qt == 'true' }} - run: brew install qt@5 + run: brew install qt - name: Get Source uses: actions/download-artifact@v3 with: @@ -534,7 +533,7 @@ jobs: -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_PREFIX=pfx \ -DCMAKE_OSX_ARCHITECTURES='x86_64' \ - -DCMAKE_PREFIX_PATH=`brew --prefix`/opt/qt@5 \ + -DCMAKE_PREFIX_PATH=`brew --prefix`/opt/qt \ -DENABLE_CLI=${{ (needs.what-to-make.outputs.make-cli == 'true') && 'ON' || 'OFF' }} \ -DENABLE_DAEMON=${{ (needs.what-to-make.outputs.make-daemon == 'true') && 'ON' || 'OFF' }} \ -DENABLE_GTK=${{ (needs.what-to-make.outputs.make-gtk == 'true') && 'ON' || 'OFF' }} \ @@ -771,7 +770,6 @@ jobs: -G Ninja \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_PREFIX=pfx \ - -DCMAKE_PREFIX_PATH=`brew --prefix`/opt/qt@5 \ -DENABLE_CLI=${{ (needs.what-to-make.outputs.make-cli == 'true') && 'ON' || 'OFF' }} \ -DENABLE_DAEMON=${{ (needs.what-to-make.outputs.make-daemon == 'true') && 'ON' || 'OFF' }} \ -DENABLE_GTK=${{ (needs.what-to-make.outputs.make-gtk == 'true') && 'ON' || 'OFF' }} \