Target rpi-7.1.y kernel for Debian trixie with packagecloud deploy

- KERNEL_BRANCH rpi-6.19.y -> rpi-7.1.y; DEBIAN_RELEASE defaults to
  trixie on this branch, producing wlanpi-kernel-trixie-v8/-2712
- Workflow: add distro choice input (default trixie), wire it to
  DEBIAN_RELEASE (the env vars it replaced were never read by
  build-kernel.sh), and parameterize artifact names by release
- Add packagecloud upload step to wlanpi/dev debian/$DEBIAN_RELEASE
  using the package_cloud CLI directly, verifying each push reports
  success (the CLI exits 0 on errors, which has produced green runs
  that uploaded nothing)
- Fail the build if no .deb is produced; push trigger follows this
  branch

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

Author: joshschmelzle

.github/workflows/build-and-archive-kernel-package.yml

@@ -3,11 +3,12 @@ name: Build and archive WLAN Pi kernel package
 on:
   push:
     branches:
-      - 6.12-bookworm
+      - 7.1-trixie
     paths:
       - 'patches/**'
       - 'wlanpi_*_defconfig'
       - 'build-kernel*.sh'
+      - '.github/workflows/build-and-archive-kernel-package.yml'
   workflow_dispatch:
     inputs:
       build_target:
@@ -19,16 +20,29 @@ on:
           - both
           - v8
           - 2712
+      distro:
+        description: 'Target Debian release'
+        required: true
+        default: 'trixie'
+        type: choice
+        options:
+          - trixie
+          - bookworm
+      upload_to_packagecloud:
+        description: 'Upload built packages to packagecloud wlanpi/dev'
+        required: true
+        default: true
+        type: boolean
 
 jobs:
   build:
     runs-on: ubuntu-24.04-arm
 
+    environment: PACKAGECLOUD
+
     env:
-      DISTRO: bookworm
-      VERSION_CODENAME: bookworm
-      KERNEL_TARGET_DISTRO: Debian
-      KERNEL_TARGET_VERSION: bookworm
+      # DEBIAN_RELEASE drives package naming in build-kernel.sh
+      DEBIAN_RELEASE: ${{ github.event.inputs.distro || 'trixie' }}
       # Set BUILD_TARGET from workflow input, default to 'both' for push events
       BUILD_TARGET: ${{ github.event.inputs.build_target || 'both' }}
 
@@ -87,7 +101,7 @@ jobs:
               exit 1
             fi
           fi
-  
+
           if [[ "$BUILD_TARGET" == "2712" || "$BUILD_TARGET" == "both" ]]; then
             if [ -f wlanpi_2712_defconfig ]; then
               echo "✓ wlanpi_2712_defconfig found"
@@ -119,51 +133,78 @@ jobs:
           echo "Built packages:"
           find output -name '*.deb' -type f -exec basename {} \;
 
+          if [ -z "$(find output -maxdepth 1 -name '*.deb' -print -quit)" ]; then
+            echo "ERROR: no .deb packages were produced"
+            exit 1
+          fi
+
       # Step 10: Upload v8 kernel package
       - name: Upload v8 kernel package
         if: ${{ env.BUILD_TARGET == 'v8' || env.BUILD_TARGET == 'both' }}
         uses: actions/upload-artifact@v4
         with:
-          name: wlanpi-kernel-bookworm-v8
-          path: output/wlanpi-kernel-bookworm-v8_*.deb
+          name: wlanpi-kernel-${{ env.DEBIAN_RELEASE }}-v8
+          path: output/wlanpi-kernel-${{ env.DEBIAN_RELEASE }}-v8_*.deb
           if-no-files-found: warn
 
       # Step 11: Upload v8 headers package
       - name: Upload v8 headers package
         if: ${{ env.BUILD_TARGET == 'v8' || env.BUILD_TARGET == 'both' }}
         uses: actions/upload-artifact@v4
         with:
-          name: wlanpi-kernel-headers-bookworm-v8
-          path: output/wlanpi-kernel-headers-bookworm-v8_*.deb
+          name: wlanpi-kernel-headers-${{ env.DEBIAN_RELEASE }}-v8
+          path: output/wlanpi-kernel-headers-${{ env.DEBIAN_RELEASE }}-v8_*.deb
           if-no-files-found: warn
 
       # Step 12: Upload 2712 kernel package
       - name: Upload 2712 Kernel Package
         if: ${{ env.BUILD_TARGET == '2712' || env.BUILD_TARGET == 'both' }}
         uses: actions/upload-artifact@v4
         with:
-          name: wlanpi-kernel-bookworm-2712
-          path: output/wlanpi-kernel-bookworm-2712_*.deb
+          name: wlanpi-kernel-${{ env.DEBIAN_RELEASE }}-2712
+          path: output/wlanpi-kernel-${{ env.DEBIAN_RELEASE }}-2712_*.deb
           if-no-files-found: warn
 
       # Step 13: Upload 2712 headers package
       - name: Upload 2712 headers package
         if: ${{ env.BUILD_TARGET == '2712' || env.BUILD_TARGET == 'both' }}
         uses: actions/upload-artifact@v4
         with:
-          name: wlanpi-kernel-headers-bookworm-2712
-          path: output/wlanpi-kernel-headers-bookworm-2712_*.deb
+          name: wlanpi-kernel-headers-${{ env.DEBIAN_RELEASE }}-2712
+          path: output/wlanpi-kernel-headers-${{ env.DEBIAN_RELEASE }}-2712_*.deb
           if-no-files-found: warn
 
       # Step 14: Upload dual kernel package
       - name: Upload dual kernel package
         if: ${{ env.BUILD_TARGET == 'both' }}
         uses: actions/upload-artifact@v4
         with:
-          name: wlanpi-kernel-bookworm-dual
-          path: output/wlanpi-kernel-bookworm_*.deb
+          name: wlanpi-kernel-${{ env.DEBIAN_RELEASE }}-dual
+          path: output/wlanpi-kernel-${{ env.DEBIAN_RELEASE }}_*.deb
           if-no-files-found: warn
 
+      # Step 15: Upload packages to packagecloud wlanpi/dev debian/DEBIAN_RELEASE.
+      # Uses the package_cloud CLI directly instead of an action so we can detect
+      # upload errors: the CLI exits 0 even when a push fails (Thor bug), which
+      # has produced green runs that uploaded nothing.
+      - name: Upload packages to packagecloud debian/${{ env.DEBIAN_RELEASE }}
+        if: ${{ (github.event_name == 'push' || github.event.inputs.upload_to_packagecloud == 'true') && (github.repository_owner == 'WLAN-Pi') }}
+        env:
+          PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
+        run: |
+          sudo gem install package_cloud
+          status=0
+          for deb in output/*.deb; do
+            echo "Pushing ${deb} to wlanpi/dev/debian/${DEBIAN_RELEASE}"
+            out=$(package_cloud push "wlanpi/dev/debian/${DEBIAN_RELEASE}" "$deb" 2>&1) || status=1
+            echo "$out"
+            if ! echo "$out" | grep -q "success!"; then
+              echo "::error::Upload of ${deb} to debian/${DEBIAN_RELEASE} did not report success"
+              status=1
+            fi
+          done
+          exit $status
+
   slack-workflow-status:
     if: ${{ always() && (github.repository_owner == 'WLAN-Pi') && (! github.event.pull_request.head.repo.fork) }}
     name: Post Workflow Status to Slack

build-kernel.sh

@@ -14,20 +14,20 @@
 #
 # Environment variables:
 #   BUILD_TARGET    - Same as TARGET argument (env overrides CLI arg)
-#   DEBIAN_RELEASE  - Target Debian release: bookworm (default), trixie
+#   DEBIAN_RELEASE  - Target Debian release: trixie (default), bookworm
 #   CI              - Set to 'true' to indicate CI environment
 #
 # Examples:
-#   ./build-kernel.sh              # Build both kernels for bookworm
-#   ./build-kernel.sh v8           # Build v8 only for bookworm
+#   ./build-kernel.sh              # Build both kernels for trixie
+#   ./build-kernel.sh v8           # Build v8 only for trixie
 #   BUILD_TARGET=2712 ./build-kernel.sh  # Build 2712 via env var
 #   DEBIAN_RELEASE=trixie ./build-kernel.sh  # Build for Trixie
 #   DEBIAN_RELEASE=trixie ./build-kernel.sh v8  # Build v8 for Trixie
 
 set -euo pipefail  # Enable strict error handling
 
 # Debian release selection (for local testing of different releases)
-DEBIAN_RELEASE="${DEBIAN_RELEASE:-bookworm}"
+DEBIAN_RELEASE="${DEBIAN_RELEASE:-trixie}"
 
 # Support both CLI args and environment variables (env takes precedence for CI)
 BUILD_TARGET="${BUILD_TARGET:-${1:-both}}"
@@ -55,7 +55,7 @@ case "$BUILD_TARGET" in
         echo ""
         echo "Environment variables:"
         echo "  BUILD_TARGET    - Override target selection (for CI)"
-        echo "  DEBIAN_RELEASE  - Target Debian release: bookworm (default), trixie"
+        echo "  DEBIAN_RELEASE  - Target Debian release: trixie (default), bookworm"
         echo ""
         echo "Examples:"
         echo "  DEBIAN_RELEASE=trixie ./build-kernel.sh v8"
@@ -121,7 +121,7 @@ echo ""
 
 # Configuration Variables
 KERNEL_REPO="https://github.com/raspberrypi/linux.git"
-KERNEL_BRANCH="rpi-6.19.y"
+KERNEL_BRANCH="rpi-7.1.y"
 KERNEL_SRC_DIR="$BASE_DIR/linux"
 OUTPUT_PATH="$BASE_DIR/output"
 CROSS_COMPILE="aarch64-linux-gnu-"