From b6bec1ab69f38ece83799438a61b89590cf62f2c Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sat, 16 Apr 2022 12:08:29 -0400 Subject: [PATCH 1/2] trivial: ci: Drop RPM Fusion repository installation for Fedora We do not need it for anything anymore. --- tests/ci/install-deps-rpm.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/ci/install-deps-rpm.sh b/tests/ci/install-deps-rpm.sh index 04ca349..61c8516 100755 --- a/tests/ci/install-deps-rpm.sh +++ b/tests/ci/install-deps-rpm.sh @@ -5,9 +5,6 @@ set -e set -x -# Install rpmfusion repositories -dnf --assumeyes --quiet install https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm --eval %fedora).noarch.rpm - # update caches dnf makecache From ea61c83e391f46179cf5f19271e699ac41becf8e Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sat, 16 Apr 2022 12:08:57 -0400 Subject: [PATCH 2/2] ci: Install ffmpeg in the Fedora images Since Fedora Linux 36, there is now an ffmpeg implementation provided in the main repositories, so let's use it. --- tests/ci/install-deps-rpm.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/ci/install-deps-rpm.sh b/tests/ci/install-deps-rpm.sh index 61c8516..376486d 100755 --- a/tests/ci/install-deps-rpm.sh +++ b/tests/ci/install-deps-rpm.sh @@ -53,6 +53,7 @@ dnf --assumeyes --quiet --setopt=install_weak_deps=False install \ xmlto \ itstool \ diffutils \ + /usr/bin/ffmpeg \ /usr/bin/node \ /usr/bin/xsltproc \ /usr/bin/yarnpkg