Skip to content

Commit

Permalink
[github-actions] migrate from macos-12 to macos-14 (#2507)
Browse files Browse the repository at this point in the history
  • Loading branch information
jwhui authored Sep 25, 2024
1 parent 60e8034 commit aba2ed6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/macOS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ concurrency:

jobs:
build-check:
runs-on: macos-12
runs-on: macos-14
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -55,7 +55,6 @@ jobs:
rm -f /usr/local/bin/python3*
brew update
brew reinstall boost cmake dbus jsoncpp ninja protobuf@21 pkg-config
brew upgrade node
- name: Build
run: |
OTBR_OPTIONS="-DOTBR_BORDER_AGENT=OFF \
Expand Down
6 changes: 3 additions & 3 deletions src/proto/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Config brew protobuf version for Mac, see .github/workflows/macOS.yml
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(Protobuf_PREFIX_PATH
"/usr/local/opt/protobuf@21/include"
"/usr/local/opt/protobuf@21/lib"
"/usr/local/opt/protobuf@21/bin")
"/opt/homebrew/opt/protobuf@21/include"
"/opt/homebrew/opt/protobuf@21/lib"
"/opt/homebrew/opt/protobuf@21/bin")
list(APPEND CMAKE_PREFIX_PATH "${Protobuf_PREFIX_PATH}")
endif()
find_package(Protobuf REQUIRED)
Expand Down

0 comments on commit aba2ed6

Please sign in to comment.