mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-21 23:33:07 +00:00
Code Issues Releases Wiki Activity

Merge pull request #8565 from ThomasWaldmann/pkgconf

Browse source 
macos: fix broken brew pkg-config -> pkgconf transition
This commit is contained in:
TW 2024-11-24 19:35:03 +01:00 committed by GitHub
commit 4c1e2bc4b0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/ci.yml vendored
View file

@ -162,7 +162,9 @@ jobs:
${{ runner.os }}- ${{ runner.os }}-
- name: Install macOS packages - name: Install macOS packages
run: brew bundle install run: |
brew unlink pkg-config@0.29.2 || true
brew bundle install
- name: Install Python requirements - name: Install Python requirements
run: | run: |

2
Brewfile
View file

@ -1,4 +1,4 @@
brew 'pkg-config' brew 'pkgconf'
brew 'zstd' brew 'zstd'
brew 'lz4' brew 'lz4'
brew 'xxhash' brew 'xxhash'

2
Vagrantfile vendored
View file

@ -171,7 +171,7 @@ def packages_macos
# now brew, curl, ca-certificates, openssl@3 should be all ok. # now brew, curl, ca-certificates, openssl@3 should be all ok.
brew update brew update
brew install pkg-config readline xxhash zstd lz4 xz brew install pkgconf readline xxhash zstd lz4 xz
brew install --cask macfuse brew install --cask macfuse
# brew upgrade # upgrade everything (takes rather long) # brew upgrade # upgrade everything (takes rather long)
# pyenv shall use the openssl@3 from homebrew: # pyenv shall use the openssl@3 from homebrew: