Skip to content

Commit

Permalink
Merge pull request #91 from smashedtoatoms/actions-mac-fix
Browse files Browse the repository at this point in the history
fix: update docs and icu in actions
  • Loading branch information
smashedtoatoms committed May 22, 2024
2 parents 5bb19db + 0ec9fad commit acbbc49
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,14 @@ jobs:
plugin_test_macos:
name: asdf plugin test (macos)
runs-on: macos-latest
env:
POSTGRES_CONFIGURE_OPTIONS: "--without-icu"
steps:
- name: add uic bin to path
run: echo "/opt/homebrew/opt/icu4c/bin" >> $GITHUB_PATH
- name: install dependencies
run: brew install gcc readline zlib curl ossp-uuid icu4c pkg-config
- name: asdf_plugin_test_macos
uses: asdf-vm/actions/plugin-test@v3
env:
PKG_CONFIG_PATH: "/usr/local/opt/icu4c/lib/pkgconfig"
with:
command: postgres --version
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ you prefer. There are some suggestions below._
### Mac

```sh
brew install gcc readline zlib curl ossp-uuid icu4c
brew install gcc readline zlib curl ossp-uuid icu4c pkg-config
```

If you are on Apple silicon, you may need to set the HOMEBREW_PREFIX environment
Expand All @@ -34,7 +34,7 @@ with icu4c. Often they can be resolved by setting your PKG_CONFIG_PATH
environment variable to reference where your linked libs live. For example:

```sh
brew install gcc readline zlib curl ossp-uuid icu4c
brew install gcc readline zlib curl ossp-uuid icu4c pkg-config
export PKG_CONFIG_PATH="/opt/homebrew/bin/pkg-config:$(brew --prefix icu4c)/lib/pkgconfig:$(brew --prefix curl)/lib/pkgconfig:$(brew --prefix zlib)/lib/pkgconfig"
```

Expand Down
2 changes: 1 addition & 1 deletion bin/install
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ lib_include_paths() {
homebrew_lib_path="$HOMEBREW_PREFIX/opt/openssl/lib"
homebrew_include_path="$HOMEBREW_PREFIX/opt/openssl/include:/opt/homebrew/include"

while read -r dir ; do
while read -r dir; do
homebrew_lib_path="$homebrew_lib_path:$dir/lib"
homebrew_include_path="$homebrew_include_path:$dir/include"
done <<<"$(ls -d $HOMEBREW_PREFIX/opt/openssl@* | sort -rV)"
Expand Down

0 comments on commit acbbc49

Please sign in to comment.