Skip to content

Commit

Permalink
Fix mac action build (#1498)
Browse files Browse the repository at this point in the history
* Fix mac action build

* Fix mac action build
  • Loading branch information
levoncrypto authored Nov 29, 2024
1 parent 2422a07 commit 60351b6
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
9 changes: 8 additions & 1 deletion .github/workflows/ci-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,14 @@ jobs:
- name: Use Xcode instead of Command Line Tools
run: sudo xcode-select -s /Applications/Xcode.app/Contents/Developer
- name: Install Required Packages
run: brew install automake coreutils pkg-config python-setuptools
run: |
if ! command -v pkg-config &> /dev/null; then
echo "pkg-config not found, installing..."
brew install pkg-config
else
echo "pkg-config is already installed"
fi
brew install automake coreutils python-setuptools
# Workaround for macOS: https://github.com/actions/runner/issues/2958
- name: Install setuptools
run: sudo -H pip install setuptools
Expand Down
2 changes: 1 addition & 1 deletion doc/build-macos.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ The built-in one is located in `/Applications/Utilities/Terminal.app`.
## Dependencies
Install the required dependencies using Homebrew:
```bash
brew install automake berkeley-db4 libtool boost miniupnpc openssl pkg-config protobuf python qt libevent qrencode python-setuptools m4
brew install automake berkeley-db4 libtool boost miniupnpc openssl protobuf python qt libevent qrencode python-setuptools m4
```

In case you want to build the disk image with `make deploy` (.dmg / optional), you need RSVG:
Expand Down
2 changes: 1 addition & 1 deletion doc/build-osx.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Then install [Homebrew](https://brew.sh).
Dependencies
----------------------

brew install automake berkeley-db4 libtool boost --c++11 miniupnpc openssl pkg-config protobuf qt libevent
brew install automake berkeley-db4 libtool boost --c++11 miniupnpc openssl protobuf qt libevent

If you want to build the disk image with `make deploy` (.dmg / optional), you need RSVG

Expand Down

0 comments on commit 60351b6

Please sign in to comment.