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.
This commit is contained in:
parent
31a7f53282
commit
6e26559cd2
|
@ -21,7 +21,7 @@ jobs:
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
- name: Install dependencies for package building
|
- name: Install dependencies for package building
|
||||||
run: |
|
run: |
|
||||||
brew install autoconf automake autoconf-archive libtool && pip3 install setuptools
|
brew install autoconf automake autoconf-archive libtool python-setuptools
|
||||||
- name: Set up CMake
|
- name: Set up CMake
|
||||||
uses: lukka/get-cmake@latest
|
uses: lukka/get-cmake@latest
|
||||||
- name: Set up vcpkg
|
- name: Set up vcpkg
|
||||||
|
|
|
@ -1,7 +1,11 @@
|
||||||
{
|
{
|
||||||
"dependencies": [
|
"dependencies": [
|
||||||
"sdl2",
|
"sdl2",
|
||||||
"libarchive",
|
{
|
||||||
|
"name": "libarchive",
|
||||||
|
"default-features": false,
|
||||||
|
"features": ["bzip2", "crypto", "lz4", "zstd"]
|
||||||
|
},
|
||||||
"libslirp",
|
"libslirp",
|
||||||
"zstd",
|
"zstd",
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue