From 925d4baa5e29777ec4332ad1728baac575314f26 Mon Sep 17 00:00:00 2001
From: MichaIng <micha@dietpi.com>
Date: Tue, 26 Sep 2023 16:32:10 +0200
Subject: [PATCH] v8.23

- CI | Enable ARMv6 Trixie builds now that a Raspbian Trixie suite exists
---
 .github/workflows/amiberry.yml        | 4 ----
 .github/workflows/dietpi-build.yml    | 6 +++---
 .github/workflows/dietpi-software.yml | 1 -
 .github/workflows/gmediarender.yml    | 1 -
 .github/workflows/gogs.yml            | 3 +--
 .github/workflows/shairport-sync.yml  | 1 -
 .github/workflows/squeezelite.yml     | 1 -
 .github/workflows/vaultwarden.yml     | 2 --
 .github/workflows/ympd.yml            | 1 -
 9 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/amiberry.yml b/.github/workflows/amiberry.yml
index 5ff035d2f1..2d3546749c 100644
--- a/.github/workflows/amiberry.yml
+++ b/.github/workflows/amiberry.yml
@@ -55,10 +55,6 @@ jobs:
         dist: ${{ fromJson(needs.prep.outputs.dist) }}
         exclude:
         - { plat: rk3588, dist: buster }
-        - { plat: rpi1, dist: trixie }
-        - { plat: rpi2, dist: trixie }
-        - { plat: rpi3, dist: trixie }
-        - { plat: rpi4, dist: trixie }
       fail-fast: false
     name: "Build: ${{ matrix.plat }} - ${{ matrix.dist }}"
     runs-on: ubuntu-22.04
diff --git a/.github/workflows/dietpi-build.yml b/.github/workflows/dietpi-build.yml
index 83bcfddf04..5f1bd0a0bc 100644
--- a/.github/workflows/dietpi-build.yml
+++ b/.github/workflows/dietpi-build.yml
@@ -27,7 +27,7 @@ jobs:
           echo buildargs=[\
         '"-m 0 -a 1 -d 6 -e all", "-m 0 -a 2 -d 6 -e all", "-m 0 -a 3 -d 6 -e all", '\
         '"-m 0 -a 1 -d 7 -e all", "-m 0 -a 2 -d 7 -e all", "-m 0 -a 3 -d 7 -e all", '\
-        '"-m 0 -a 2 -d 8 -e all", "-m 0 -a 3 -d 8 -e all", '\
+        '"-m 0 -a 1 -d 8 -e all", "-m 0 -a 2 -d 8 -e all", "-m 0 -a 3 -d 8 -e all", '\
         '"-m 10 -d 6", "-m 10 -d 7", "-m 10 -d 8", '\
         '"-m 11 -d 6", "-m 11 -d 7", "-m 11 -d 8", '\
         '"-m 12 -d 6", "-m 12 -d 7", "-m 12 -d 8", '\
@@ -74,7 +74,7 @@ jobs:
         '"-m 75 -a 1 -d 5", "-m 75 -a 2 -d 5", "-m 75 -a 3 -d 5", "-m 75 -a 10 -d 5", '\
         '"-m 75 -a 1 -d 6", "-m 75 -a 2 -d 6", "-m 75 -a 3 -d 6", "-m 75 -a 10 -d 6", '\
         '"-m 75 -a 1 -d 7", "-m 75 -a 2 -d 7", "-m 75 -a 3 -d 7", "-m 75 -a 10 -d 7", '\
-        '"-m 75 -a 2 -d 8", "-m 75 -a 3 -d 8", "-m 75 -a 10 -d 8", "-m 75 -a 11 -d 8", '\
+        '"-m 75 -a 1 -d 8", "-m 75 -a 2 -d 8", "-m 75 -a 3 -d 8", "-m 75 -a 10 -d 8", "-m 75 -a 11 -d 8", '\
         '"-m 76 -d 6", "-m 76 -d 7", "-m 76 -d 8", '\
         '"-m 77 -d 6", "-m 77 -d 7", "-m 77 -d 8", '\
         '"-m 78 -d 6", "-m 78 -d 7", "-m 78 -d 8", '\
@@ -93,7 +93,7 @@ jobs:
           echo buildargs=[\
         '"-m 0 -a 1 -d 6 -e all", "-m 0 -a 2 -d 6 -e all", "-m 0 -a 3 -d 6 -e all", '\
         '"-m 0 -a 1 -d 7 -e all", "-m 0 -a 2 -d 7 -e all", "-m 0 -a 3 -d 7 -e all", '\
-        '"-m 0 -a 2 -d 8 -e all", "-m 0 -a 3 -d 8 -e all"]' >> "$GITHUB_OUTPUT"
+        '"-m 0 -a 1 -d 8 -e all", "-m 0 -a 2 -d 8 -e all", "-m 0 -a 3 -d 8 -e all"]' >> "$GITHUB_OUTPUT"
         else
           echo buildargs='["${{ github.event.inputs.buildargs }}"]' >> "$GITHUB_OUTPUT"
         fi
diff --git a/.github/workflows/dietpi-software.yml b/.github/workflows/dietpi-software.yml
index 0adc48db86..d9904d4404 100644
--- a/.github/workflows/dietpi-software.yml
+++ b/.github/workflows/dietpi-software.yml
@@ -67,7 +67,6 @@ jobs:
         - { arch: riscv64, dist: buster }
         - { arch: riscv64, dist: bullseye }
         - { arch: riscv64, dist: bookworm }
-        - { arch: armv6l, dist: trixie }
         # Temporarily prevent Trixie/Sid builds until systemd + QEMU incompatibility fix has been released: https://github.com/systemd/systemd/pull/28954
         - { dist: trixie }
       fail-fast: false
diff --git a/.github/workflows/gmediarender.yml b/.github/workflows/gmediarender.yml
index d05feb9db5..227a1001e4 100644
--- a/.github/workflows/gmediarender.yml
+++ b/.github/workflows/gmediarender.yml
@@ -56,7 +56,6 @@ jobs:
         - { arch: riscv64, dist: buster }
         - { arch: riscv64, dist: bullseye }
         - { arch: riscv64, dist: bookworm }
-        - { arch: armv6l, dist: trixie }
       fail-fast: false
     name: "Build: ${{ matrix.arch }} - ${{ matrix.dist }}"
     runs-on: ubuntu-22.04
diff --git a/.github/workflows/gogs.yml b/.github/workflows/gogs.yml
index 881a7bd95d..ab6ce1742f 100644
--- a/.github/workflows/gogs.yml
+++ b/.github/workflows/gogs.yml
@@ -49,7 +49,6 @@ jobs:
         - { arch: 11, dist: 5 }
         - { arch: 11, dist: 6 }
         - { arch: 11, dist: 7 }
-        - { arch: 1, dist: 8 }
       fail-fast: false
     name: "Build: ${{ matrix.arch }} - ${{ matrix.dist }}"
     runs-on: ubuntu-22.04
@@ -65,7 +64,7 @@ jobs:
         arch=${{ matrix.arch }}
         dist=${{ matrix.dist }}
         arch_to_name=([1]='armv6l' [2]='armv7l' [3]='aarch64' [10]='x86_64' [11]='riscv64')
-        dist_to_name=([5]='buster' [6]='bullseye' [7]='bookworm')
+        dist_to_name=([5]='buster' [6]='bullseye' [7]='bookworm' [8]='trixie')
         arch_name=${arch_to_name[$arch]}
         dist_name=${dist_to_name[$dist]}
 
diff --git a/.github/workflows/shairport-sync.yml b/.github/workflows/shairport-sync.yml
index 5ab8fa4f1f..afb46fe8db 100644
--- a/.github/workflows/shairport-sync.yml
+++ b/.github/workflows/shairport-sync.yml
@@ -56,7 +56,6 @@ jobs:
         - { arch: riscv64, dist: buster }
         - { arch: riscv64, dist: bullseye }
         - { arch: riscv64, dist: bookworm }
-        - { arch: armv6l, dist: trixie }
       fail-fast: false
     name: "Build: ${{ matrix.arch }} - ${{ matrix.dist }}"
     runs-on: ubuntu-22.04
diff --git a/.github/workflows/squeezelite.yml b/.github/workflows/squeezelite.yml
index fabdcd5ed0..e795784733 100644
--- a/.github/workflows/squeezelite.yml
+++ b/.github/workflows/squeezelite.yml
@@ -56,7 +56,6 @@ jobs:
         - { arch: riscv64, dist: buster }
         - { arch: riscv64, dist: bullseye }
         - { arch: riscv64, dist: bookworm }
-        - { arch: armv6l, dist: trixie }
       fail-fast: false
     name: "Build: ${{ matrix.arch }} - ${{ matrix.dist }}"
     runs-on: ubuntu-22.04
diff --git a/.github/workflows/vaultwarden.yml b/.github/workflows/vaultwarden.yml
index c4681256ff..aa9c12ed91 100644
--- a/.github/workflows/vaultwarden.yml
+++ b/.github/workflows/vaultwarden.yml
@@ -52,8 +52,6 @@ jobs:
       matrix:
         arch: ${{ fromJson(needs.prep.outputs.arch) }}
         dist: ${{ fromJson(needs.prep.outputs.dist) }}
-        exclude:
-        - { arch: armv6l, dist: trixie }
       fail-fast: false
     name: "Build: ${{ matrix.arch }} - ${{ matrix.dist }}"
     runs-on: ubuntu-22.04
diff --git a/.github/workflows/ympd.yml b/.github/workflows/ympd.yml
index dcdf2aec10..ec63e31fe1 100644
--- a/.github/workflows/ympd.yml
+++ b/.github/workflows/ympd.yml
@@ -56,7 +56,6 @@ jobs:
         - { arch: riscv64, dist: buster }
         - { arch: riscv64, dist: bullseye }
         - { arch: riscv64, dist: bookworm }
-        - { arch: armv6l, dist: trixie }
       fail-fast: false
     name: "Build: ${{ matrix.arch }} - ${{ matrix.dist }}"
     runs-on: ubuntu-22.04