[tracker-miners/sam/libav-testing] ci: Use ffmpeg instead of libav
- From: Sam Thursfield <sthursfield src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker-miners/sam/libav-testing] ci: Use ffmpeg instead of libav
- Date: Wed, 31 Aug 2022 17:14:53 +0000 (UTC)
commit c1ce9ab218470af9995654c78b7a48ff86f499d7
Author: Sam Thursfield <sam thursfield codethink co uk>
Date: Wed Aug 31 19:14:31 2022 +0200
ci: Use ffmpeg instead of libav
Since libav is abandoned, and ffmpeg is now packaged in Fedora.
.gitlab-ci.yml | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4e67ed2de..2beabcf79 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -61,16 +61,14 @@ check-merge-request:
.tracker-miners.fedora@common:
variables:
- BASE_TAG: '2022-08-28.1'
+ BASE_TAG: '2022-08-31.2'
FDO_UPSTREAM_REPO: GNOME/tracker
- FDO_DISTRIBUTION_PACKAGES: 'clang clang-analyzer gcovr git libasan libubsan python3-gobject python3-pip
umockdev-devel xmlto uncrustify patch diffutils gstreamer1-plugins-good redhat-rpm-config'
+ FDO_DISTRIBUTION_PACKAGES: 'clang clang-analyzer ffmpeg-free ffmpeg-free-devel gcovr git libasan
libubsan python3-gobject python3-pip umockdev-devel xmlto uncrustify patch diffutils gstreamer1-plugins-good
redhat-rpm-config'
FDO_DISTRIBUTION_EXEC: |
dnf install -y 'dnf-command(builddep)' &&
dnf builddep -y tracker tracker-miners --setopt=install_weak_deps=False &&
dnf clean all &&
pip3 install beautifulsoup4 mkdocs mkdocs-cinder tap.py meson &&
- dnf install -y https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E
%fedora).noarch.rpm https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E
%fedora).noarch.rpm &&
- dnf install -y --setopt=install_weak_deps=False gstreamer1-libav libavcodec-free-devel
libavformat-free-devel libavutil-free-devel &&
curl --get 'https://www.flamingspork.com/projects/libeatmydata/libeatmydata-105.tar.gz' --output
libeatmydata-105.tar.gz &&
tar -x -f ./libeatmydata-105.tar.gz &&
cd libeatmydata-105 &&
@@ -193,14 +191,14 @@ check-code-style:
paths:
- build
-.build-libav-template: &build-libav
+.build-ffmeg-template: &build-ffmpeg
<<: *build
script:
- .gitlab-ci/checkout-tracker.sh
- echo "Building tracker.git commit $(git -C ./subprojects/tracker rev-parse HEAD)"
- mkdir build
- cd build
- - meson .. --prefix=/usr -Dtracker_core=subproject -Db_lto=true -Db_coverage=true
-Dtests_tap_protocol=true -Dtracker:docs=false -Dgeneric_media_extractor=libav
+ - meson .. --prefix=/usr -Dtracker_core=subproject -Db_lto=true -Db_coverage=true
-Dtests_tap_protocol=true -Dtracker:docs=false -Dgeneric_media_extractor=ffmpeg
- ninja
build-fedora@x86_64:
@@ -211,13 +209,13 @@ build-fedora@x86_64:
- build-fedora-container@x86_64
<<: *build
-build-libav-fedora@x86_64:
+build-ffmpeg-fedora@x86_64:
extends:
- .fdo.distribution-image@fedora
- .tracker-miners.fedora:36@x86_64
needs:
- build-fedora-container@x86_64
- <<: *build-libav
+ <<: *build-ffmpeg
build-fedora-rawhide@x86_64:
extends:
@@ -290,12 +288,12 @@ test-fedora@x86_64:
- build-fedora@x86_64
<<: *test
-test-libav-fedora@x86_64:
+test-ffmpeg-fedora@x86_64:
extends:
- .fdo.distribution-image@fedora
- .tracker-miners.fedora:36@x86_64
needs:
- - build-libav-fedora@x86_64
+ - build-ffmpeg-fedora@x86_64
<<: *test
test-fedora-rawhide@x86_64:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]