mirror of
https://github.com/borgbackup/borg.git
synced 2024-12-21 15:23:11 +00:00
Merge pull request #8565 from ThomasWaldmann/pkgconf
macos: fix broken brew pkg-config -> pkgconf transition
This commit is contained in:
commit
4c1e2bc4b0
3 changed files with 5 additions and 3 deletions
4
.github/workflows/ci.yml
vendored
4
.github/workflows/ci.yml
vendored
|
@ -162,7 +162,9 @@ jobs:
|
|||
${{ runner.os }}-
|
||||
|
||||
- name: Install macOS packages
|
||||
run: brew bundle install
|
||||
run: |
|
||||
brew unlink pkg-config@0.29.2 || true
|
||||
brew bundle install
|
||||
|
||||
- name: Install Python requirements
|
||||
run: |
|
||||
|
|
2
Brewfile
2
Brewfile
|
@ -1,4 +1,4 @@
|
|||
brew 'pkg-config'
|
||||
brew 'pkgconf'
|
||||
brew 'zstd'
|
||||
brew 'lz4'
|
||||
brew 'xxhash'
|
||||
|
|
2
Vagrantfile
vendored
2
Vagrantfile
vendored
|
@ -171,7 +171,7 @@ def packages_macos
|
|||
|
||||
# now brew, curl, ca-certificates, openssl@3 should be all ok.
|
||||
brew update
|
||||
brew install pkg-config readline xxhash zstd lz4 xz
|
||||
brew install pkgconf readline xxhash zstd lz4 xz
|
||||
brew install --cask macfuse
|
||||
# brew upgrade # upgrade everything (takes rather long)
|
||||
# pyenv shall use the openssl@3 from homebrew:
|
||||
|
|
Loading…
Reference in a new issue