mirror of
https://github.com/transmission/transmission
synced 2025-01-03 13:35:36 +00:00
ci: update workflow to Qt 6 on macOS (#6206)
* Remove brew lines on Linux * Switch to Qt 6 on macOS
This commit is contained in:
parent
2c9768bc12
commit
9cadcbdb86
1 changed files with 4 additions and 6 deletions
10
.github/workflows/actions.yml
vendored
10
.github/workflows/actions.yml
vendored
|
@ -245,7 +245,7 @@ jobs:
|
||||||
run: brew install gtkmm3
|
run: brew install gtkmm3
|
||||||
- name: Get Dependencies (Qt)
|
- name: Get Dependencies (Qt)
|
||||||
if: ${{ needs.what-to-make.outputs.make-qt == 'true' }}
|
if: ${{ needs.what-to-make.outputs.make-qt == 'true' }}
|
||||||
run: brew install qt@5
|
run: brew install qt
|
||||||
- name: Get Source
|
- name: Get Source
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
|
@ -260,7 +260,7 @@ jobs:
|
||||||
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
||||||
-DCMAKE_INSTALL_PREFIX=pfx \
|
-DCMAKE_INSTALL_PREFIX=pfx \
|
||||||
-DCMAKE_OSX_ARCHITECTURES='x86_64' \
|
-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_CLI=${{ (needs.what-to-make.outputs.make-cli == 'true') && 'ON' || 'OFF' }} \
|
||||||
-DENABLE_DAEMON=${{ (needs.what-to-make.outputs.make-daemon == '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' }} \
|
-DENABLE_GTK=${{ (needs.what-to-make.outputs.make-gtk == 'true') && 'ON' || 'OFF' }} \
|
||||||
|
@ -336,7 +336,6 @@ jobs:
|
||||||
-G Ninja \
|
-G Ninja \
|
||||||
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
||||||
-DCMAKE_INSTALL_PREFIX=pfx \
|
-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_CLI=${{ (needs.what-to-make.outputs.make-cli == 'true') && 'ON' || 'OFF' }} \
|
||||||
-DENABLE_DAEMON=${{ (needs.what-to-make.outputs.make-daemon == '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' }} \
|
-DENABLE_GTK=${{ (needs.what-to-make.outputs.make-gtk == 'true') && 'ON' || 'OFF' }} \
|
||||||
|
@ -518,7 +517,7 @@ jobs:
|
||||||
run: brew install gtkmm3
|
run: brew install gtkmm3
|
||||||
- name: Get Dependencies (Qt)
|
- name: Get Dependencies (Qt)
|
||||||
if: ${{ needs.what-to-make.outputs.make-qt == 'true' }}
|
if: ${{ needs.what-to-make.outputs.make-qt == 'true' }}
|
||||||
run: brew install qt@5
|
run: brew install qt
|
||||||
- name: Get Source
|
- name: Get Source
|
||||||
uses: actions/download-artifact@v3
|
uses: actions/download-artifact@v3
|
||||||
with:
|
with:
|
||||||
|
@ -534,7 +533,7 @@ jobs:
|
||||||
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
||||||
-DCMAKE_INSTALL_PREFIX=pfx \
|
-DCMAKE_INSTALL_PREFIX=pfx \
|
||||||
-DCMAKE_OSX_ARCHITECTURES='x86_64' \
|
-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_CLI=${{ (needs.what-to-make.outputs.make-cli == 'true') && 'ON' || 'OFF' }} \
|
||||||
-DENABLE_DAEMON=${{ (needs.what-to-make.outputs.make-daemon == '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' }} \
|
-DENABLE_GTK=${{ (needs.what-to-make.outputs.make-gtk == 'true') && 'ON' || 'OFF' }} \
|
||||||
|
@ -771,7 +770,6 @@ jobs:
|
||||||
-G Ninja \
|
-G Ninja \
|
||||||
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
||||||
-DCMAKE_INSTALL_PREFIX=pfx \
|
-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_CLI=${{ (needs.what-to-make.outputs.make-cli == 'true') && 'ON' || 'OFF' }} \
|
||||||
-DENABLE_DAEMON=${{ (needs.what-to-make.outputs.make-daemon == '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' }} \
|
-DENABLE_GTK=${{ (needs.what-to-make.outputs.make-gtk == 'true') && 'ON' || 'OFF' }} \
|
||||||
|
|
Loading…
Reference in a new issue