Skip to content

Commit

Permalink
Add libxcb to removed packages for maOS builds (#93)
Browse files Browse the repository at this point in the history
FFmpeg is built and linked against libcxb on CI, which breaks compilation on hosts without it.
  • Loading branch information
PatTheMav authored Feb 13, 2022
1 parent 7918ed0 commit 3cbc7b2
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
env:
MACOSX_DEPLOYMENT_TARGET_X86_64: '10.13'
MACOSX_DEPLOYMENT_TARGET_ARM64: '11.0'
CACHE_REVISION: '11'
CACHE_REVISION: '12'
NTV2_VERSION: '16.1'
NTV2_HASH: 'abf17cc1e7aadd9f3e4972774a3aba2812c51b75'
LIBPNG_VERSION: '1.6.37'
Expand Down Expand Up @@ -61,7 +61,7 @@ jobs:
LIBFREETYPE_HASH: '86a854d8905b19698bbc8f23b860bc104246ce4854dcea8e3b0fb21284f75784'
LIBRNNOISE_VERSION: '2020-07-28'
LIBRNNOISE_HASH: '90ec41ef659fd82cfec2103e9bb7fc235e9ea66c'
BLOCKED_FORMULAS: 'ant gradle maven selenium-server selenium-server-standalone llvm gcc postgresql openjdk sox libsndfile flac libvorbis opusfile libogg composer php gd freetype fontconfig webp libpng lame libtiff opus kotlin sbt libxft'
BLOCKED_FORMULAS: 'llvm gcc postgresql openjdk sox libsndfile flac libvorbis opusfile libogg composer php gd freetype fontconfig webp libpng lame libtiff opus kotlin sbt libxft libxcb'
defaults:
run:
shell: bash
Expand Down Expand Up @@ -104,7 +104,7 @@ jobs:
done
if [ -n "${REMOVE_FORMULAS}" ]; then
brew uninstall ${REMOVE_FORMULAS}
brew uninstall --ignore-dependencies ${REMOVE_FORMULAS}
fi
brew bundle --file "CI/include/Brewfile"
Expand Down Expand Up @@ -400,7 +400,7 @@ jobs:
QT_REVISION: '03'
QT_VERSION: '5.15.2'
QT_HASH: '3a530d1b243b5dec00bc54937455471aaa3e56849d2593edb8ded07228202240'
BLOCKED_FORMULAS: 'ant gradle maven selenium-server selenium-server-standalone llvm gcc postgresql openjdk sox libsndfile flac libvorbis opusfile libogg composer php gd freetype fontconfig webp libpng lame libtiff opus kotlin sbt libxft'
BLOCKED_FORMULAS: 'llvm gcc postgresql openjdk sox libsndfile flac libvorbis opusfile libogg composer php gd freetype fontconfig webp libpng lame libtiff opus kotlin sbt libxft libxcb'
defaults:
run:
shell: bash
Expand All @@ -427,7 +427,7 @@ jobs:
done
if [ -n "${REMOVE_FORMULAS}" ]; then
brew uninstall ${REMOVE_FORMULAS}
brew uninstall --ignore-dependencies ${REMOVE_FORMULAS}
fi
brew bundle --file "CI/include/Brewfile"
Expand Down

0 comments on commit 3cbc7b2

Please sign in to comment.