From daab6a72da62f1e2bedf32c7b31def5613607589 Mon Sep 17 00:00:00 2001
From: jsz <josh@joshschmelzle.com>
Date: Fri, 29 Nov 2024 20:03:34 -0500
Subject: [PATCH] Fix CI for dual kernel distros (#10)

* stop using set-output
* default to arm64
* add distro to filename
* dont run slack job from forks or PRs
* Updated sbuild git module to 4e83148
---
 .github/workflows/build-kernel.yml | 8 ++++----
 build-kernel.sh                    | 6 ++++--
 sbuild-debian-package              | 2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build-kernel.yml b/.github/workflows/build-kernel.yml
index 229942f..bd729f2 100644
--- a/.github/workflows/build-kernel.yml
+++ b/.github/workflows/build-kernel.yml
@@ -39,11 +39,11 @@ jobs:
       - name: Upload kernel
         uses: actions/upload-artifact@v4
         with:
-          name: wlanpi-kernel-${{ steps.build-kernel.outputs.package-version }}
+          name: wlanpi-kernel-${{ steps.build-kernel.outputs.package-version }}-${{ matrix.distro }}
           path: ${{ steps.build-kernel.outputs.deb-package }}
 
       - name: Upload package to debian/${{ matrix.distro }} on packagecloud
-        if: ${{ github.event.ref == format('refs/heads/{0}', github.event.repository.default_branch) }}
+        if: ${{ github.event.ref == format('refs/heads/{0}', github.event.repository.default_branch) && (github.repository_owner == 'WLAN-Pi') && (! github.event.pull_request.head.repo.fork) }}
         uses: danielmundi/upload-packagecloud@main
         with:
           package-name: ${{ steps.build-kernel.outputs.deb-package }}
@@ -51,9 +51,9 @@ jobs:
           packagecloud-repo: dev
           packagecloud-distrib: debian/${{ matrix.distro }}
           packagecloud-token: ${{ secrets.PACKAGECLOUD_TOKEN }}
-          
+  
   slack-workflow-status:
-    if: always()
+    if: ${{ always() && (github.repository_owner == 'WLAN-Pi') && (! github.event.pull_request.head.repo.fork) }}
     name: Post Workflow Status to Slack
     needs:
       - build
diff --git a/build-kernel.sh b/build-kernel.sh
index a9f9726..684a635 100755
--- a/build-kernel.sh
+++ b/build-kernel.sh
@@ -22,7 +22,7 @@ WLANPI_DEFCONFIG="wlanpi_v7l_defconfig"
 KERNEL_FORCE_SYNC="0"
 CLEAN_KERNEL="0"
 SKIP_PATCHES="0"
-DEB_ARCH="armhf"
+DEB_ARCH="arm64"
 EXEC_FUNC=""
 NUM_CORES=$(($(nproc)/2))
 export DEBFULLNAME="Daniel Finimundi"
@@ -227,7 +227,9 @@ prepare_build_package()
     (cd debian; ./gen_kernel_preinst_postinst.sh "${KERNEL_ARCH// /,}")
     dch -v "$DEBVER" -D bullseye --force-distribution "Kernel version ${KERNEL_VERSION}"
 
-    echo "::set-output name=package-version::${DEBVER}"
+    # https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands/
+    # echo "::set-output name=package-version::${DEBVER}"
+    echo "package-version=${DEBVER}" >> $GITHUB_OUTPUT
 }
 
 build_package()
diff --git a/sbuild-debian-package b/sbuild-debian-package
index 11c5b9c..4e83148 160000
--- a/sbuild-debian-package
+++ b/sbuild-debian-package
@@ -1 +1 @@
-Subproject commit 11c5b9ce5e6533e70763e06800a69e0c0044879d
+Subproject commit 4e8314827a2cf214fac73f62eeb7769e58627785