diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index b72a2c10e0..1dee5da308 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -43,16 +43,13 @@ jobs: cd .. - name: Install sqlite - # Brew package does not have unlock-notify + # MacOS package does not have unlock-notify, but brew 3.42.0_1+ does, so + # install that and make sure it's used run: | - wget https://www.sqlite.org/2020/sqlite-autoconf-3310100.tar.gz - tar xzf sqlite-autoconf-3310100.tar.gz - cd sqlite-autoconf-3310100 - export CFLAGS='-DSQLITE_ENABLE_UNLOCK_NOTIFY=1' - ./configure - make - sudo make install - cd .. + brew install sqlite + export LD_LIBRARY_PATH=$(brew --prefix sqlite)/lib + export CPATH=$(brew --prefix sqlite)/include + export PKG_CONFIG_PATH=$(brew --prefix sqlite)/lib/pkgconfig - name: Install ffmpeg # The libbluray ffmpeg dependency fails without the chown (source: stackoverflow) @@ -61,7 +58,7 @@ jobs: brew install ffmpeg - name: Install other dependencies - run: brew install libunistring libmxml confuse libplist sqlite libwebsockets libevent libgcrypt json-c protobuf-c libsodium gnutls pulseaudio openssl + run: brew install libunistring libmxml confuse libplist libwebsockets libevent libgcrypt json-c protobuf-c libsodium gnutls pulseaudio openssl - name: Configure run: |