mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #8214 from ThomasWaldmann/fix-ci-macos-openssl-master 

github CI: fix PKG_CONFIG_PATH for openssl 3.0
This commit is contained in:
TW 2024-05-12 16:12:19 +02:00 committed by GitHub
parent 0c1df415d7 7baf8beed6
commit 5e36ba789a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/ci.yml vendored
View File

@ -135,7 +135,7 @@ jobs:
env: env:
# Configure pkg-config to use OpenSSL from Homebrew # Configure pkg-config to use OpenSSL from Homebrew
PKG_CONFIG_PATH: "/usr/local/opt/openssl@3.0/lib/pkgconfig:$PKG_CONFIG_PATH" PKG_CONFIG_PATH: "/opt/homebrew/opt/openssl@3.0/lib/pkgconfig:$PKG_CONFIG_PATH"
TOXENV: ${{ matrix.toxenv }} TOXENV: ${{ matrix.toxenv }}
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
@ -170,14 +170,14 @@ jobs:
env: env:
# we already have that in the global env, but something is broken and overwrites that. # we already have that in the global env, but something is broken and overwrites that.
# so, set it here, again. # so, set it here, again.
PKG_CONFIG_PATH: "/usr/local/opt/openssl@3.0/lib/pkgconfig:$PKG_CONFIG_PATH" PKG_CONFIG_PATH: "/opt/homebrew/opt/openssl@3.0/lib/pkgconfig:$PKG_CONFIG_PATH"
run: | run: |
pip install -ve . pip install -ve .
- name: run tox env - name: run tox env
env: env:
# we already have that in the global env, but something is broken and overwrites that. # we already have that in the global env, but something is broken and overwrites that.
# so, set it here, again. # so, set it here, again.
PKG_CONFIG_PATH: "/usr/local/opt/openssl@3.0/lib/pkgconfig:$PKG_CONFIG_PATH" PKG_CONFIG_PATH: "/opt/homebrew/opt/openssl@3.0/lib/pkgconfig:$PKG_CONFIG_PATH"
XDISTN: "6" XDISTN: "6"
run: | run: |
# do not use fakeroot, but run as root. avoids the dreaded EISDIR sporadic failures. see #2482. # do not use fakeroot, but run as root. avoids the dreaded EISDIR sporadic failures. see #2482.