-
-
Notifications
You must be signed in to change notification settings - Fork 739
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #8213 from ThomasWaldmann/fix-ci-macos-openssl-1.2
github CI: fix PKG_CONFIG_PATH for openssl 3.0
- Loading branch information
Showing
1 changed file
with
3 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -75,7 +75,7 @@ jobs: | |
|
||
env: | ||
# Configure pkg-config to use OpenSSL from Homebrew | ||
PKG_CONFIG_PATH: "/usr/local/opt/[email protected]/lib/pkgconfig:$PKG_CONFIG_PATH" | ||
PKG_CONFIG_PATH: "/opt/homebrew/opt/[email protected]/lib/pkgconfig:$PKG_CONFIG_PATH" | ||
TOXENV: ${{ matrix.toxenv }} | ||
|
||
runs-on: ${{ matrix.os }} | ||
|
@@ -125,15 +125,15 @@ jobs: | |
env: | ||
# we already have that in the global env, but something is broken and overwrites that. | ||
# so, set it here, again. | ||
PKG_CONFIG_PATH: "/usr/local/opt/[email protected]/lib/pkgconfig:$PKG_CONFIG_PATH" | ||
PKG_CONFIG_PATH: "/opt/homebrew/opt/[email protected]/lib/pkgconfig:$PKG_CONFIG_PATH" | ||
run: | | ||
# pip install -e . | ||
python setup.py -v develop | ||
- name: run pytest via tox | ||
env: | ||
# we already have that in the global env, but something is broken and overwrites that. | ||
# so, set it here, again. | ||
PKG_CONFIG_PATH: "/usr/local/opt/[email protected]/lib/pkgconfig:$PKG_CONFIG_PATH" | ||
PKG_CONFIG_PATH: "/opt/homebrew/opt/[email protected]/lib/pkgconfig:$PKG_CONFIG_PATH" | ||
run: | | ||
# do not use fakeroot, but run as root. avoids the dreaded EISDIR sporadic failures. see #2482. | ||
#sudo -E bash -c "tox -e py" | ||
|