Use proto21 on macos11 (#4914)
This commit is contained in:
parent
e9c502ab32
commit
cb90a8356b
1 changed files with 9 additions and 2 deletions
11
.github/workflows/desktop-build.yml
vendored
11
.github/workflows/desktop-build.yml
vendored
|
@ -214,6 +214,7 @@ jobs:
|
|||
type: Release
|
||||
do_tests: 1
|
||||
make_package: 1
|
||||
use_old_protobuf: 1
|
||||
|
||||
- target: 12_Monterey
|
||||
os: macos-12
|
||||
|
@ -249,10 +250,16 @@ jobs:
|
|||
# neither of these works: mariadb-connector-c mysql-connector-c++
|
||||
env:
|
||||
install_qt: ${{matrix.qt_version}}
|
||||
use_old_protobuf: ${{matrix.use_old_protobuf}}
|
||||
run: |
|
||||
brew update
|
||||
brew install protobuf
|
||||
brew link --force protobuf
|
||||
if [[ $use_old_protobuf == 1 ]]; then
|
||||
brew install protobuf@21
|
||||
brew link --force protobuf@21
|
||||
else
|
||||
brew install protobuf
|
||||
brew link --force protobuf
|
||||
fi
|
||||
if [[ $install_qt == homebrew ]]; then
|
||||
brew install qt --force-bottle
|
||||
else # for some reason the tests fail with the action installed qt?
|
||||
|
|
Loading…
Reference in a new issue