Skip to content

Commit

Permalink
ci: fix macOS build
Browse files Browse the repository at this point in the history
GitHub Actions' macOS runners have Python from homebrew installed and it's used by default instead of the Python that ships with macOS. Apparently Homebrew decided you shouldn't be able to install stuff with `pip3` anymore so our build broke since `setuptools` is no longer included by default and `glib` from vcpkg needs it to build.

Additionally,, the whole liblzma mess ended up breaking our builds too because libarchive (and its dependency libxml2) depends on it and the download is no longer available. The build option changes here should be reverted once this is sorted out because this is probably partially breaking archive support.

PS: Fuck you Jia Tan.
  • Loading branch information
nadiaholmquist authored Apr 3, 2024
1 parent 31a7f53 commit 6e26559
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
uses: actions/checkout@v3
- name: Install dependencies for package building
run: |
brew install autoconf automake autoconf-archive libtool && pip3 install setuptools
brew install autoconf automake autoconf-archive libtool python-setuptools
- name: Set up CMake
uses: lukka/get-cmake@latest
- name: Set up vcpkg
Expand Down
6 changes: 5 additions & 1 deletion vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
{
"dependencies": [
"sdl2",
"libarchive",
{
"name": "libarchive",
"default-features": false,
"features": ["bzip2", "crypto", "lz4", "zstd"]
},
"libslirp",
"zstd",
{
Expand Down

0 comments on commit 6e26559

Please sign in to comment.