From: Flole998 <Flole998@users.noreply.github.com>
Date: Sun, 6 Aug 2023 07:43:32 +0000 (+0200)
Subject: Fix some build and add more targets
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e352c6c7871d434f9b022f7f203c31e9609121b;p=thirdparty%2Ftvheadend.git

Fix some build and add more targets
---

diff --git a/.github/workflows/build-cloudsmith.yml b/.github/workflows/build-cloudsmith.yml
index 248f2b16e..681e9d375 100644
--- 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 3e047466b..079b30d8c 100644
--- 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
index 000000000..7d6d426f5
--- /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
index 000000000..5e9e36de8
--- /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
index 5543405a6..000000000
--- 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
index 000000000..81b1776ba
--- /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
index 000000000..7a3d76039
--- /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
index 000000000..8d20af0db
--- /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
index 000000000..91c017d97
--- /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 bf37b2f00..29eedb4c1 100755
--- 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";;