Fix some build and add more targets

diff --git a/.github/workflows/build-cloudsmith.yml b/.github/workflows/build-cloudsmith.yml
index 248f2b16e3a6431da54e0887b6a9b6e4b0f0d377..681e9d3753c6f6e909fe583fff65536787521509 100644 (file)
--- a/.github/workflows/build-cloudsmith.yml
+++ b/.github/workflows/build-cloudsmith.yml
@@ -116,8 +116,14 @@ jobs:
           # no secrets are present in the container state or logs.
           install: |
             if [ '${{ matrix.distro }}' = 'jessie' ]; then sed -i 's/archive.raspbian.org/legacy.raspbian.org/g' /etc/apt/sources.list; fi
+            if [ '${{ matrix.distro }}' = 'jessie' ]; then sed -i 's/deb.debian.org/archive.debian.org/g' /etc/apt/sources.list; fi
+            if [ '${{ matrix.distro }}' = 'jessie' ]; then sed -i 's/security.debian.org/archive.debian.org/g' /etc/apt/sources.list; fi
+            if [ '${{ matrix.distro }}' = 'jessie' ]; then sed -i '/jessie-updates/d' /etc/apt/sources.list; fi
+            if [ '${{ matrix.distro }}' = 'stretch' ]; then sed -i 's/deb.debian.org/archive.debian.org/g' /etc/apt/sources.list; fi
+            if [ '${{ matrix.distro }}' = 'stretch' ]; then sed -i 's/security.debian.org/archive.debian.org/g' /etc/apt/sources.list; fi
+            if [ '${{ matrix.distro }}' = 'stretch' ]; then sed -i '/stretch-updates/d' /etc/apt/sources.list; fi
             case "${{ matrix.distro }}" in
-              ubuntu*|jessie|stretch|buster|bullseye)
+              ubuntu*|jessie|stretch|buster|bullseye|bookworm)
                 apt-get update -y
                 DEBIAN_FRONTEND=noninteractive apt-get install --force-yes -y cmake git build-essential pkg-config gettext libavahi-client-dev libssl-dev zlib1g-dev wget bzip2 git-core liburiparser-dev libdvbcsa-dev python3 python3-requests debhelper ccache lsb-release
                 DEBIAN_FRONTEND=noninteractive apt-get install --force-yes -y libpcre3-dev || DEBIAN_FRONTEND=noninteractive apt-get install --force-yes -y libpcre2-dev
@@ -154,6 +160,12 @@ jobs:
     container:
       image: ${{ matrix.container }}
     steps:
+      - name: Fix old debian apt
+        if: matrix.container == 'debian:stretch' || matrix.container == 'i386/debian:stretch'
+        run: |
+          sed -i 's/deb.debian.org/archive.debian.org/g' /etc/apt/sources.list
+          sed -i 's/security.debian.org/archive.debian.org/g' /etc/apt/sources.list
+          sed -i '/stretch-updates/d' /etc/apt/sources.list
       - name: Add git ppa
         if: startsWith(matrix.container, 'ubuntu') || startsWith(matrix.container, 'i386/ubuntu')
         run: |

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3e047466bf7446cde0f8f9b66bc6ae4d17e8d8f5..079b30d8ccf55ec6c07ffd9f220ac434794383c5 100644 (file)
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,11 +1,6 @@
-name: Build Tvheadend Repo
+name: Build Tvheadend CI
 
 on:
-  push:
-    branches:
-      - master
-    tags:
-      - 'v*'
   pull_request:
     branches:
       - master
@@ -117,8 +112,14 @@ jobs:
           # no secrets are present in the container state or logs.
           install: |
             if [ '${{ matrix.distro }}' = 'jessie' ]; then sed -i 's/archive.raspbian.org/legacy.raspbian.org/g' /etc/apt/sources.list; fi
+            if [ '${{ matrix.distro }}' = 'jessie' ]; then sed -i 's/deb.debian.org/archive.debian.org/g' /etc/apt/sources.list; fi
+            if [ '${{ matrix.distro }}' = 'jessie' ]; then sed -i 's/security.debian.org/archive.debian.org/g' /etc/apt/sources.list; fi
+            if [ '${{ matrix.distro }}' = 'jessie' ]; then sed -i '/jessie-updates/d' /etc/apt/sources.list; fi
+            if [ '${{ matrix.distro }}' = 'stretch' ]; then sed -i 's/deb.debian.org/archive.debian.org/g' /etc/apt/sources.list; fi
+            if [ '${{ matrix.distro }}' = 'stretch' ]; then sed -i 's/security.debian.org/archive.debian.org/g' /etc/apt/sources.list; fi
+            if [ '${{ matrix.distro }}' = 'stretch' ]; then sed -i '/stretch-updates/d' /etc/apt/sources.list; fi
             case "${{ matrix.distro }}" in
-              ubuntu*|jessie|stretch|buster|bullseye)
+              ubuntu*|jessie|stretch|buster|bullseye|bookworm)
                 apt-get update -y
                 DEBIAN_FRONTEND=noninteractive apt-get install --force-yes -y cmake git build-essential pkg-config gettext libavahi-client-dev libssl-dev zlib1g-dev wget bzip2 git-core liburiparser-dev libdvbcsa-dev python3 python3-requests debhelper ccache lsb-release
                 DEBIAN_FRONTEND=noninteractive apt-get install --force-yes -y libpcre3-dev || DEBIAN_FRONTEND=noninteractive apt-get install --force-yes -y libpcre2-dev
@@ -154,6 +155,12 @@ jobs:
     container:
       image: ${{ matrix.container }}
     steps:
+      - name: Fix old debian apt
+        if: matrix.container == 'debian:stretch' || matrix.container == 'i386/debian:stretch'
+        run: |
+          sed -i 's/deb.debian.org/archive.debian.org/g' /etc/apt/sources.list
+          sed -i 's/security.debian.org/archive.debian.org/g' /etc/apt/sources.list
+          sed -i '/stretch-updates/d' /etc/apt/sources.list
       - name: Add git ppa
         if: startsWith(matrix.container, 'ubuntu') || startsWith(matrix.container, 'i386/ubuntu')
         run: |

diff --git a/Autobuild/bookworm-aarch64.sh b/Autobuild/bookworm-aarch64.sh
new file mode 100644 (file)
index 0000000..7d6d426
--- /dev/null
+++ b/Autobuild/bookworm-aarch64.sh
@@ -0,0 +1,2 @@
+source Autobuild/aarch64.sh
+source Autobuild/bookworm.sh

diff --git a/Autobuild/bookworm-armv7l.sh b/Autobuild/bookworm-armv7l.sh
new file mode 100644 (file)
index 0000000..5e9e36d
--- /dev/null
+++ b/Autobuild/bookworm-armv7l.sh
@@ -0,0 +1,2 @@
+source Autobuild/armv7l.sh
+source Autobuild/bookworm.sh

diff --git a/Autobuild/bullseye-i686.sh.save b/Autobuild/bullseye-i686.sh.save
deleted file mode 100644 (file)
index 5543405..0000000
--- a/Autobuild/bullseye-i686.sh.save
+++ /dev/null
@@ -1,3 +0,0 @@
-AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --arch=i686"
-
-source Autobuild/bullseye.sh

diff --git a/Autobuild/trixie-i386.sh b/Autobuild/trixie-i386.sh
new file mode 100644 (file)
index 0000000..81b1776
--- /dev/null
+++ b/Autobuild/trixie-i386.sh
@@ -0,0 +1,2 @@
+source Autobuild/i386.sh
+source Autobuild/trixie.sh

diff --git a/Autobuild/trixie-i686.sh b/Autobuild/trixie-i686.sh
new file mode 100644 (file)
index 0000000..7a3d760
--- /dev/null
+++ b/Autobuild/trixie-i686.sh
@@ -0,0 +1,2 @@
+source Autobuild/i686.sh
+source Autobuild/trixie.sh

diff --git a/Autobuild/trixie-x86_64.sh b/Autobuild/trixie-x86_64.sh
new file mode 100644 (file)
index 0000000..8d20af0
--- /dev/null
+++ b/Autobuild/trixie-x86_64.sh
@@ -0,0 +1,2 @@
+source Autobuild/x86_64.sh
+source Autobuild/trixie.sh

diff --git a/Autobuild/trixie.sh b/Autobuild/trixie.sh
new file mode 100644 (file)
index 0000000..91c017d
--- /dev/null
+++ b/Autobuild/trixie.sh
@@ -0,0 +1,2 @@
+DEBDIST=trixie
+source Autobuild/debian.sh

diff --git a/support/cloudsmith.sh b/support/cloudsmith.sh
index bf37b2f00855f553f196055ee58a212fcdf11498..29eedb4c1b1424e79fba71bd02ae99c22bf659ba 100755 (executable)
--- a/support/cloudsmith.sh
+++ b/support/cloudsmith.sh
@@ -39,7 +39,7 @@ if [[ -z $TARGET ]]; then
 fi
 
 case $OSPREFIX$TARGET in
-    bookworm|bullseye|buster|sid|stretch|jessie)
+    bookworm|bullseye|buster|sid|stretch|jessie|trixie)
         OS="debian";;
     bionic|focal|jammy|kinetic|impish|trusty|xenial)
         OS="ubuntu";;