removed ubuntu focal/debian buster

added debian trixie armv6 (upgrade from bookworm)

Author: Paulchen-Panther

.github/workflows/package.yml

@@ -17,28 +17,20 @@ jobs:
       fail-fast: false
       matrix:
         os: [
-          { distribution: ubuntu, codename: focal,    description: Ubuntu 20.04 (Focal Fossa),     target_platform: "['amd64', 'arm64', 'armv7']" },
           { distribution: ubuntu, codename: jammy,    description: Ubuntu 22.04 (Jammy Jellyfish), target_platform: "['amd64', 'arm64', 'armv7']" },
           { distribution: ubuntu, codename: noble,    description: Ubuntu 24.04 (Noble Numbat),    target_platform: "['amd64', 'arm64', 'armv7']" },
           { distribution: ubuntu, codename: oracular, description: Ubuntu 24.10 (Oracular Oriole), target_platform: "['amd64', 'arm64', 'armv7']" },
           { distribution: ubuntu, codename: plucky,   description: Ubuntu 25.04 (Plucky Puffin),   target_platform: "['amd64', 'arm64', 'armv7']" },
-          { distribution: debian, codename: buster,   description: Debian 10.x  (Buster),          target_platform: "['amd64', 'arm64', 'armv6', 'armv7']" },
           { distribution: debian, codename: bullseye, description: Debian 11.x  (Bullseye),        target_platform: "['amd64', 'arm64', 'armv6', 'armv7']" },
           { distribution: debian, codename: bookworm, description: Debian 12.x  (Bookworm),        target_platform: "['amd64', 'arm64', 'armv6', 'armv7']" },
-          { distribution: debian, codename: trixie,   description: Debian 13.x  (Trixie),          target_platform: "['amd64', 'arm64', 'armv7']" },
+          { distribution: debian, codename: trixie,   description: Debian 13.x  (Trixie),          target_platform: "['amd64', 'arm64', 'armv6', 'armv7']" },
           { distribution: fedora, codename: 39,       description: Fedora 39,                      target_platform: "['amd64', 'arm64']" },
           { distribution: fedora, codename: 40,       description: Fedora 40,                      target_platform: "['amd64', 'arm64']" },
           { distribution: fedora, codename: 41,       description: Fedora 41,                      target_platform: "['amd64', 'arm64']" },
           { distribution: fedora, codename: 42,       description: Fedora 42,                      target_platform: "['amd64', 'arm64']" }
         ]
         qt_version: [ 5, 6 ]
-        exclude:
-          # Qt6 is not available on Ubuntu Focal and Debian Buster
-          # Qt6 on Debian Bullseye (only armv6) is excluded in reusable workflow qt5_6.yml because target_platform is passed as string to reusable workflow
-          - os: { codename: focal }
-            qt_version: 6
-          - os: { codename: buster }
-            qt_version: 6
+        # Qt6 on Debian Bullseye (only armv6) is excluded in reusable workflow qt5_6.yml because target_platform is passed as string to reusable workflow
 
     uses: ./.github/workflows/qt5_6.yml
     secrets: inherit

.github/workflows/qt5_6.yml

@@ -96,10 +96,11 @@ jobs:
           outputs: type=image,name=ghcr.io/${{ env.REPOSITORY }}/${{ inputs.distribution }},push-by-digest=true,name-canonical=true,push=true
           build-args: |
             DIST=${{ inputs.distribution }}
-            SUITE=${{ inputs.codename }}
+            SUITE=${{ inputs.codename == 'trixie' && matrix.target_platform == 'armv6' && 'bookworm' || inputs.codename }}
             QT_VERSION=${{ inputs.qt_version }}
             REPOSITORY="${{ github.server_url }}/${{ env.REPOSITORY }}"
             CMAKE_VERSION=${{ env.CMAKE_VERSION }}
+            UPGRADE_TO_TRIXIE=${{ inputs.codename == 'trixie' && matrix.target_platform == 'armv6' && 'true' || 'false' }}
 
       - name: ⬇ Export digest
         run: |

debian-armv6

@@ -1,11 +1,13 @@
 ARG SUITE="buster"
+ARG UPGRADE_TO_TRIXIE="false"
 ARG QT_VERSION="5"
 ARG REPOSITORY="https://github.com/hyperion-project"
 ARG CMAKE_VERSION="3.28.3"
 
 FROM balenalib/rpi-raspbian:${SUITE}
 
 ARG SUITE
+ARG UPGRADE_TO_TRIXIE
 ARG QT_VERSION
 ARG REPOSITORY
 ARG CMAKE_VERSION
@@ -18,6 +20,13 @@ ENV TARGETPLATFORM=${TARGETPLATFORM:-linux/arm/v6}
 # update
 RUN apt-get update
 
+# upgrade from Bookworm to Trixie
+RUN if [ "$UPGRADE_TO_TRIXIE" = "true" ]; then \
+    apt-get dist-upgrade; \
+    sed -i -e 's/bookworm/trixie/g' /etc/apt/sources.list; \
+    apt update && apt-get -y full-upgrade && apt -y clean && apt -y autoremove; \
+fi
+
 # install qt5 or qt6 (qt6 is not available on debian buster/bullseye)
 RUN if [ "$SUITE" = "bookworm" ] && [ "$QT_VERSION" = "6" ]; then \
     apt-get -y install qt6-base-dev libqt6sql6-sqlite qt6-serialport-dev qt6-websockets-dev libxkbcommon-dev libvulkan-dev libgl1-mesa-dev; \