From: Flole998 Date: Fri, 10 May 2024 21:17:34 +0000 (+0000) Subject: Make builds parallel and add bookworm and ubuntu 24.04 builds X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f159f6aec04526c20837fe43c1c7ba9117555955;p=thirdparty%2Ftvheadend.git Make builds parallel and add bookworm and ubuntu 24.04 builds --- diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml index 64fb7fab1..53cfc0c6b 100644 --- a/.github/workflows/build-ci.yml +++ b/.github/workflows/build-ci.yml @@ -66,7 +66,7 @@ jobs: strategy: matrix: arch: [ armv7, aarch64] - distro: [ stretch, buster, bullseye, ubuntu16.04, ubuntu18.04, ubuntu20.04, ubuntu22.04 ] + distro: [ stretch, buster, bullseye, bookworm, ubuntu16.04, ubuntu18.04, ubuntu20.04, ubuntu22.04, ubuntu_latest ] include: - arch: armv6 distro: jessie @@ -158,7 +158,7 @@ jobs: name: Build on native ${{ matrix.container }} strategy: matrix: - container: ["i386/ubuntu:trusty", "ubuntu:trusty", "i386/ubuntu:xenial", "ubuntu:xenial", "ubuntu:bionic", "ubuntu:focal", "ubuntu:jammy", "ubuntu:lunar", "ubuntu:mantic", "i386/debian:stretch", "debian:stretch", "i386/debian:buster", "debian:buster", "i386/debian:bullseye", "debian:bullseye", "i386/debian:bookworm", "debian:bookworm", "i386/debian:trixie", "debian:trixie", "debian:sid"] + container: ["i386/ubuntu:trusty", "ubuntu:trusty", "i386/ubuntu:xenial", "ubuntu:xenial", "ubuntu:bionic", "ubuntu:focal", "ubuntu:jammy", "ubuntu:lunar", "ubuntu:mantic", "ubuntu:noble", "i386/debian:stretch", "debian:stretch", "i386/debian:buster", "debian:buster", "i386/debian:bullseye", "debian:bullseye", "i386/debian:bookworm", "debian:bookworm", "i386/debian:trixie", "debian:trixie", "debian:sid"] container: image: ${{ matrix.container }} steps: @@ -222,7 +222,7 @@ jobs: - name: Workaround safe directory run: git config --global --add safe.directory /__w/tvheadend/tvheadend - name: build - run: ./configure --disable-dvbscan --disable-libfdkaac_static --disable-ffmpeg_static --disable-hdhomerun_static --disable-libfdkaac_static --disable-libopus_static --disable-libtheora_static --disable-libvorbis_static --disable-libvpx_static --disable-libx264_static --disable-libx265_static --enable-libfdkaac --enable-hdhomerun_client --enable-libsystemd_daemon --python=/usr/bin/python3 && make -C rpm build + run: ./configure --disable-dvbscan --disable-libfdkaac_static --disable-ffmpeg_static --disable-hdhomerun_static --disable-libfdkaac_static --disable-libopus_static --disable-libtheora_static --disable-libvorbis_static --disable-libvpx_static --disable-libx264_static --disable-libx265_static --enable-libfdkaac --enable-hdhomerun_client --enable-libsystemd_daemon --python=/usr/bin/python3 && make -C rpm build -j$(nproc) - name: copy-result run: cp rpm/RPMS/*/tvheadend*.rpm . - uses: actions/upload-artifact@v3 diff --git a/.github/workflows/build-cloudsmith.yml b/.github/workflows/build-cloudsmith.yml index d5aa5b319..cad45f649 100644 --- a/.github/workflows/build-cloudsmith.yml +++ b/.github/workflows/build-cloudsmith.yml @@ -68,7 +68,7 @@ jobs: strategy: matrix: arch: [ armv7, aarch64] - distro: [ stretch, buster, bullseye, ubuntu16.04, ubuntu18.04, ubuntu20.04, ubuntu22.04 ] + distro: [ stretch, buster, bullseye, bookworm, ubuntu16.04, ubuntu18.04, ubuntu20.04, ubuntu22.04, ubuntu_latest ] include: - arch: armv6 distro: jessie @@ -166,7 +166,7 @@ jobs: name: Build on native ${{ matrix.container }} strategy: matrix: - container: ["i386/ubuntu:trusty", "ubuntu:trusty", "i386/ubuntu:xenial", "ubuntu:xenial", "ubuntu:bionic", "ubuntu:focal", "ubuntu:jammy", "i386/debian:stretch", "debian:stretch", "i386/debian:buster", "debian:buster", "i386/debian:bullseye", "debian:bullseye", "i386/debian:bookworm", "debian:bookworm", "i386/debian:trixie", "debian:trixie", "i386/debian:sid", "debian:sid"] + container: ["i386/ubuntu:trusty", "ubuntu:trusty", "i386/ubuntu:xenial", "ubuntu:xenial", "ubuntu:bionic", "ubuntu:focal", "ubuntu:jammy", "ubuntu:noble", "i386/debian:stretch", "debian:stretch", "i386/debian:buster", "debian:buster", "i386/debian:bullseye", "debian:bullseye", "i386/debian:bookworm", "debian:bookworm", "i386/debian:trixie", "debian:trixie", "i386/debian:sid", "debian:sid"] container: image: ${{ matrix.container }} steps: diff --git a/Autobuild/bookworm-armv7l.sh b/Autobuild/bookworm-armv7l.sh index 5e9e36de8..a6bb41f66 100644 --- a/Autobuild/bookworm-armv7l.sh +++ b/Autobuild/bookworm-armv7l.sh @@ -1,2 +1,3 @@ +AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --disable-libx265_static --disable-libx265" source Autobuild/armv7l.sh source Autobuild/bookworm.sh diff --git a/Autobuild/noble-aarch64.sh b/Autobuild/noble-aarch64.sh new file mode 100644 index 000000000..1dd85988d --- /dev/null +++ b/Autobuild/noble-aarch64.sh @@ -0,0 +1,2 @@ +source Autobuild/aarch64.sh +source Autobuild/noble.sh diff --git a/Autobuild/noble-armv7l.sh b/Autobuild/noble-armv7l.sh new file mode 100644 index 000000000..e8aa13c8f --- /dev/null +++ b/Autobuild/noble-armv7l.sh @@ -0,0 +1,3 @@ +AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --disable-libx265_static --disable-libx265" +source Autobuild/armv7l.sh +source Autobuild/noble.sh diff --git a/Autobuild/noble-x86_64.sh b/Autobuild/noble-x86_64.sh new file mode 100644 index 000000000..9decfded7 --- /dev/null +++ b/Autobuild/noble-x86_64.sh @@ -0,0 +1,2 @@ +source Autobuild/x86_64.sh +source Autobuild/noble.sh diff --git a/Autobuild/noble.sh b/Autobuild/noble.sh new file mode 100644 index 000000000..b0eb2f590 --- /dev/null +++ b/Autobuild/noble.sh @@ -0,0 +1,2 @@ +DEBDIST=noble +source Autobuild/debian.sh diff --git a/debian/rules b/debian/rules index 883e095a2..15402bfc8 100755 --- a/debian/rules +++ b/debian/rules @@ -2,6 +2,11 @@ export DH_VERBOSE=1 export DEB_BUILD_MAINT_OPTIONS = hardening=+all +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + EXTRAMAKEFLAGS += -j$(NUMJOBS) +endif + %: dh $@ --with-systemd @@ -12,7 +17,7 @@ override_dh_auto_configure: dh_auto_configure -- ${AUTOBUILD_CONFIGURE_EXTRA} ${JOBSARGS} override_dh_auto_build: - make ${JARGS} + make ${JARGS} ${EXTRAMAKEFLAGS} override_dh_strip: dh_strip --dbg-package=tvheadend-dbg diff --git a/support/cloudsmith.sh b/support/cloudsmith.sh index 990feb6db..75ff0cf5f 100755 --- a/support/cloudsmith.sh +++ b/support/cloudsmith.sh @@ -51,7 +51,7 @@ fi case $OSPREFIX$TARGET in bookworm|bullseye|buster|sid|stretch|jessie|trixie) OS="debian";; - trusty|xenial|bionic|focal|impish|jammy|kinetic|lunar|mantic) + trusty|xenial|bionic|focal|impish|jammy|kinetic|lunar|mantic|noble) OS="ubuntu";; raspios*) OS="raspbian";;