Skip to content

Commit 9dd3e52

Browse files
committed
ci: auto detect kernel package
Add support to request the automatic detection and use of the kernel matching the pattern linux-image-* that is present in the local directory of extra debs, and use this from the linux.yml workflow. This saves us having to manually keep linux.yml in sync with the latest upstream tag. Discussion in qualcomm-linux#216 Signed-off-by: Robie Basak <robie.basak@oss.qualcomm.com>
1 parent 464da99 commit 9dd3e52

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

.github/workflows/debos.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,17 @@ jobs:
8989
- name: Build rootfs with debos
9090
run: |
9191
set -ux
92+
if [ "${{ inputs.mainline_kernel }}" = true -a "${{ inputs.kernelpackage }}" = auto ]; then
93+
kernelpackage="$(find local-apt-repo/linux-deb-latest -type f -name 'linux-image-*' -not -name '*dbg*'|xargs -n1 basename|cut -f1 -d_)"
94+
else
95+
kernelpackage="${{ inputs.kernelpackage }}"
96+
fi
97+
9298
debos \
9399
-t overlays:'${{ inputs.overlays }}' \
94100
-t xfcedesktop:true \
95101
-t aptlocalrepo:${PWD}/local-apt-repo \
96-
-t kernelpackage:'${{ inputs.kernelpackage }}' \
102+
-t kernelpackage:"$kernelpackage" \
97103
-t "buildid:${BUILD_ID}" \
98104
--print-recipe \
99105
debos-recipes/qualcomm-linux-debian-rootfs.yaml

.github/workflows/linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
uses: ./.github/workflows/debos.yml
102102
with:
103103
mainline_kernel: true
104-
kernelpackage: linux-image-6.19.0-rc3-g8640b74557fc
104+
kernelpackage: auto
105105

106106
test-mainline-linux:
107107
uses: ./.github/workflows/lava-test.yml

0 commit comments

Comments
 (0)