From 50ee2989757615dafe3b3b11f88eb1492615161d Mon Sep 17 00:00:00 2001 From: jhoyt4 Date: Mon, 12 Feb 2024 19:22:45 -0500 Subject: [PATCH] Github workflow: Fix linking error on macOS 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. --- .github/workflows/buildmaster.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/buildmaster.yml b/.github/workflows/buildmaster.yml index ce242c33d31..dcd8e8cc106 100644 --- a/.github/workflows/buildmaster.yml +++ b/.github/workflows/buildmaster.yml @@ -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) @@ -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