Use matrix with parametrized ci.yaml for future os upgrades

.github/workflows/ci.yml

@@ -7,17 +7,19 @@ permissions:
 
 jobs:
   package-build:
-
     runs-on: ubuntu-latest
-
+    strategy:
+      fail-fast: false
+      matrix:
+        distro: [focal]
     steps:
     - uses: actions/checkout@v6
-    - name: Run package build focal
-      run: script/cibuild-create-packages-focal
+    - name: Run package build ${{ matrix.distro }}
+      run: script/cibuild-create-packages ${{ matrix.distro }}
     - name: Tar files
-      run: tar -cvf glb-director.tar $GITHUB_WORKSPACE/tmp/build
+      run: tar -cvf glb-director-${{ matrix.distro }}.tar $GITHUB_WORKSPACE/tmp/build
     - name: Upload Artifact
       uses: actions/upload-artifact@v7
       with:
-        name: glb-director
-        path: glb-director.tar
+        name: glb-director-${{ matrix.distro }}
+        path: glb-director-${{ matrix.distro }}.tar

script/Dockerfile.focal

@@ -1,4 +1,4 @@
-FROM ubuntu:focal
+FROM --platform=linux/amd64 ubuntu:focal@sha256:8feb4d8ca5354def3d8fce243717141ce31e2c428701f6682bd2fafe15388214
 
 RUN echo 'Acquire::Retries "10";' > /etc/apt/apt.conf.d/80-retries
 

script/cibuild-create-packages

@@ -7,9 +7,20 @@ cd "$(dirname "$0")/.."
 
 . script/helpers/folding.sh
 
+DISTRO="$1"
+if [ -z "$DISTRO" ]; then
+  DISTRO="focal"
+fi
+
+DOCKERFILE="script/Dockerfile.$DISTRO"
+if [ ! -f "$DOCKERFILE" ]; then
+  echo "Error: unsupported distro '$DISTRO' or missing Dockerfile '$DOCKERFILE'." >&2
+  exit 1
+fi
+
 begin_fold "Preparing Docker build environment"
 (
-  docker build -t glb-director-build-stretch -f script/Dockerfile.stretch script
+  docker build -t glb-director-build-$DISTRO -f "$DOCKERFILE" script
 )
 end_fold
 
@@ -21,8 +32,8 @@ begin_fold "Building packages"
 
   docker run --rm \
     --volume "$HOSTPATH":/glb-director \
-    "glb-director-build-stretch" \
+    "glb-director-build-$DISTRO" \
     bash -c "cd /glb-director &&
       make BUILDDIR=/glb-director/tmp/build clean mkdeb"
 )
-end_fold
+end_fold

script/helpers/folding.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
 
 begin_fold() {
-	echo "%%%FOLD {$*}%%%"
+    echo "::group::$*"
 }
 
 end_fold() {
-	echo "%%%END FOLD%%%"
-}
+    echo "::endgroup::"
+}