Skip to content

Commit

Permalink
[gh-actions] Remove build of sqlite from MacOS workflow mk2
Browse files Browse the repository at this point in the history
Homebrew's sqlite now comes with sqlite3_unlock_notify (Homebrew issue #55077),
so a custom build is no longer required.
  • Loading branch information
ejurgensen committed Aug 24, 2023
1 parent 7f6387f commit 07a95dc
Showing 1 changed file with 7 additions and 10 deletions.
17 changes: 7 additions & 10 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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: |
Expand Down

0 comments on commit 07a95dc

Please sign in to comment.