aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use proto21 on macos11 (#4914)

Browse source
This commit is contained in:
Zach H 2023-10-15 20:30:50 -04:00 committed by GitHub
parent e9c502ab32
commit cb90a8356b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
.github/workflows/desktop-build.yml vendored
View file

@ -214,6 +214,7 @@ jobs:
type: Release type: Release
do_tests: 1 do_tests: 1
make_package: 1 make_package: 1
use_old_protobuf: 1
- target: 12_Monterey - target: 12_Monterey
os: macos-12 os: macos-12
@ -249,10 +250,16 @@ jobs:
# neither of these works: mariadb-connector-c mysql-connector-c++ # neither of these works: mariadb-connector-c mysql-connector-c++
env: env:
install_qt: ${{matrix.qt_version}} install_qt: ${{matrix.qt_version}}
use_old_protobuf: ${{matrix.use_old_protobuf}}
run: | run: |
brew update brew update
brew install protobuf if [[ $use_old_protobuf == 1 ]]; then
brew link --force protobuf brew install protobuf@21
brew link --force protobuf@21
else
brew install protobuf
brew link --force protobuf
fi
if [[ $install_qt == homebrew ]]; then if [[ $install_qt == homebrew ]]; then
brew install qt --force-bottle brew install qt --force-bottle
else # for some reason the tests fail with the action installed qt? else # for some reason the tests fail with the action installed qt?