Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ jobs:
PYBIND11_VERSION: ${{matrix.pybind11_ver}}
PYTHON_VERSION: ${{matrix.python_ver}}
ABI_CHECK: ${{matrix.abi_check}}
USE_FFMPEG: 0
steps:
# Install nodejs 20 with glibc 2.17, to work around the face that the
# GHA runners are insisting on a node version that is too new for the
Expand Down
4 changes: 2 additions & 2 deletions src/build-scripts/gh-installdeps.bash
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ if [[ "$ASWF_ORG" != "" ]] ; then
if [[ "${USE_OPENCV}" != "0" ]] ; then
time sudo yum install -y opencv opencv-devel || true
fi
if [[ "${USE_FFMPEG}" != "0" ]] ; then
time sudo dnf install -y ffmpeg ffmpeg-devel || true
if [[ "${USE_FFMPEG:-1}" != "0" ]] ; then
time sudo dnf install -y ffmpeg ffmpeg-devel || (sleep 10 && echo "try 2" && time sudo dnf install -y ffmpeg ffmpeg-devel)
fi
if [[ "${USE_FREETYPE:-1}" != "0" ]] ; then
time sudo yum install -y freetype freetype-devel || true
Expand Down
Loading