From 6e26559cd2a225437072a67b4a55f7fd5831057d Mon Sep 17 00:00:00 2001 From: Nadia Holmquist Pedersen Date: Wed, 3 Apr 2024 14:49:27 +0200 Subject: [PATCH] ci: fix macOS build 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. --- .github/workflows/build-macos.yml | 2 +- vcpkg.json | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index 1d4b9171..4178157d 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -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 diff --git a/vcpkg.json b/vcpkg.json index a1bd0be5..3e23ff1b 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,7 +1,11 @@ { "dependencies": [ "sdl2", - "libarchive", + { + "name": "libarchive", + "default-features": false, + "features": ["bzip2", "crypto", "lz4", "zstd"] + }, "libslirp", "zstd", {