Skip to content

Commit

Permalink
Github workflow: Fix linking error on macOS
Browse files Browse the repository at this point in the history
 Homebrew has multiple versions of python which occasionally step on
 each other. Add the overwrite flag in the install process to
 explicity oveverwrite old links.

 Additionally add a call to brew upgrade to handle issues where
 new packages require updating already installed ones.
  • Loading branch information
jhoyt4 committed Feb 13, 2024
1 parent 62ad21b commit 50ee298
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions .github/workflows/buildmaster.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,14 @@ jobs:
env:
OS_VERS: ${{ matrix.os }}
run: |
brew update
${PKGMGR_CMD} install pkg-config ccache qt5 nasm libsamplerate taglib\
lzo libcec libbluray libass libhdhomerun dav1d x264 x265 libvpx \
openssl sound-touch lame freetype libass libiconv libxml2 libzip \
XviD zlib pyenv-virtualenv python-lxml python-requests \
python-setuptools
${PKGMGR_CMD} link qt5 --force
${PKGMGR_CMD} update
${PKGMGR_CMD} upgrade
${PKGMGR_CMD} install pkg-config ccache qt@5 nasm libsamplerate \
taglib lzo libcec libbluray libass libhdhomerun dav1d x264 x265 \
libvpx openssl sound-touch lame freetype libass libiconv libxml2 \
libzip XviD zlib pyenv-virtualenv python-lxml python-requests \
python-setuptools --force --overwrite
${PKGMGR_CMD} link qt@5 --force
# macos-14 updated the linker and needs to be run in "classic" mode
case $OS_VERS in
macos-14)
Expand Down Expand Up @@ -169,7 +170,7 @@ jobs:

- name: Install plugin dependencies (macOS)
run: ${PKGMGR_CMD} install minizip flac libvorbis libcdio python-pycurl
python-oauthlib
python-oauthlib --force --overwrite
if: runner.os == 'macOS'

- name: Configure plugins
Expand Down

0 comments on commit 50ee298

Please sign in to comment.