Build adafruithat & planktoscopehat variants of bookworm OS images (#537)

* Try to build adafruithat & planktoscopehat variants of bookworm OS images

* Make GitHub Actions logs slightly nicer

* Remove unused environment variable

* Reduce build-os workflow timeout

* Bump pishrink-action

Author: ethanjli

.github/workflows/build-os-bookworm-dx.yml

@@ -34,8 +34,8 @@ jobs:
       fail-fast: false
       matrix:
         variant:
-          - none
-          - segmenter-only
+          - adafruithat
+          - planktoscopehat
         base_variant_name:
           - desktop
     permissions:
@@ -45,7 +45,7 @@ jobs:
     uses: ./.github/workflows/build-os.yml
     secrets: inherit
     with:
-      name: rpi-forklift-demo
+      name: planktoscope
       base_release_name: bookworm
       base_image_variant: ${{ matrix.base_variant_name }}
       base_release_date: 2024-11-19

.github/workflows/build-os-bookworm.yml

@@ -34,8 +34,8 @@ jobs:
       fail-fast: false
       matrix:
         variant:
-          - none
-          - segmenter-only
+          - adafruithat
+          - planktoscopehat
         base_variant_name:
           - lite
     permissions:
@@ -45,7 +45,7 @@ jobs:
     uses: ./.github/workflows/build-os.yml
     secrets: inherit
     with:
-      name: rpi-forklift-demo
+      name: planktoscope
       base_release_name: bookworm
       base_image_variant: ${{ matrix.base_variant_name }}
       base_release_date: 2024-11-19

.github/workflows/build-os-bullseye-fairscope.yml

@@ -36,6 +36,7 @@ jobs:
         variant:
           - adafruithat
           - planktoscopehat
+          - fairscope-latest
         base_variant_name:
           - lite
     permissions:

.github/workflows/build-os-bullseye.yml

@@ -36,13 +36,12 @@ jobs:
     name: Build image
     runs-on: ubuntu-24.04-arm
     env:
-      KERNEL_VERSION: 6.1.21
       SETUP_USER: pi
     permissions:
       contents: read
       packages: write
       id-token: write
-    timeout-minutes: 90
+    timeout-minutes: 30
     steps:
       - name: Get actual repo & commit SHA
         run: |
@@ -236,7 +235,16 @@ jobs:
           key: "container-images-${{ inputs.arch }}-pallet-${{ env.PALLET }}"
           path: ${{ steps.setup-precaching.outputs.path }}
 
-      - name: Copy pre-downloaded container images into image
+      # Note: the following step isn't strictly necessary, but it's nice to separate the GitHub
+      # Actions log outputs for setting up pinspawn-action for the first time from the logs for
+      # pre-downloading container images
+      - name: Install pinspawn-action dependencies
+        uses: ethanjli/pinspawn-action@v0.1.4
+        with:
+          image: ${{ steps.expand-image.outputs.destination }}
+          run: echo "Done!"
+
+      - name: Copy pre-downloaded container images into OS image
         uses: ethanjli/pinspawn-action@v0.1.4
         with:
           image: ${{ steps.expand-image.outputs.destination }}