Skip to content

Commit f0e5839

Browse files
committed
Revert "hack along"
This reverts commit 0c08ddf. Reapply "Try to stick with cURL 8.10.1" This reverts commit 017a664. Revert "Try to stick with cURL 8.10.1" This reverts commit bacafaa. Reapply "fix PATH" This reverts commit 7c35ecd.
1 parent 0c08ddf commit f0e5839

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

.github/actions/brew/action.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ runs:
1414
# Some packages exist on x86 but not arm, or vice versa.
1515
# Install them with reinstall to avoid warnings.
1616
brew reinstall autoconf webp tidy-html5 libzip libsodium icu4c curl openldap
17+
brew unlink pkg-config
1718
brew install \
19+
pkgconf \
1820
bison \
1921
re2c
2022
brew install \

.github/actions/configure-macos/action.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ runs:
1111
set -x
1212
BREW_OPT="$(brew --prefix)"/opt
1313
export PATH="$BREW_OPT/bison/bin:$PATH"
14-
export PATH="/usr/local/Cellar/pkgconf/2.3.0:$PATH"
15-
ls -l /usr/local/Cellar/pkgconf/2.3.0
14+
export PATH="/usr/local/Cellar/pkgconf/2.3.0/bin:$PATH"
1615
export PKG_CONFIG_PATH="$BREW_OPT/openssl@3/lib/pkgconfig:$PKG_CONFIG_PATH"
1716
export PKG_CONFIG_PATH="$BREW_OPT/curl/lib/pkgconfig:$PKG_CONFIG_PATH"
1817
export PKG_CONFIG_PATH="$BREW_OPT/libffi/lib/pkgconfig:$PKG_CONFIG_PATH"

0 commit comments

Comments
 (0)