From 32f579354f468175475eeef9e0f90fe1ec63ac97 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 15 Mar 2024 15:57:16 +0100
Subject: github: Add more kernels to build matrix

---
 .github/workflows/build-kernel-module.yml | 64 ++++++++++++++++++++-----------
 1 file changed, 42 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/build-kernel-module.yml b/.github/workflows/build-kernel-module.yml
index 41c13b7..526bf8e 100644
--- a/.github/workflows/build-kernel-module.yml
+++ b/.github/workflows/build-kernel-module.yml
@@ -12,36 +12,46 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - name: kernel module [CentOS 8.4 kernel 4.18.0-x]
-            build-os: ubuntu-20.04
-            kernel-type: centos
-            kernel-version: 4.18.0-305.25.1
+          - name: CentOS 8.4 [4.18.0]
+            build-os: ubuntu-22.04
+            kernel-type: centos-rpm
             kernel-source: https://vault.centos.org/8.4.2105/BaseOS/Source/SPackages/kernel-4.18.0-305.25.1.el8_4.src.rpm
-          - name: kernel module [CentOS 8.5 kernel 4.18.0-x]
-            build-os: ubuntu-20.04
-            kernel-type: centos
-            kernel-version: 4.18.0-348.2.1
+          - name: CentOS 8.5 [4.18.0]
+            build-os: ubuntu-22.04
+            kernel-type: centos-rpm
             kernel-source: https://vault.centos.org/8.5.2111/BaseOS/Source/SPackages/kernel-4.18.0-348.2.1.el8_5.src.rpm
-          - name: kernel module [Linux kernel 4.19.x]
-            build-os: ubuntu-20.04
+          - name: CentOS 9.3 [5.14.0]
+            build-os: ubuntu-22.04
+            kernel-type: centos-tar
+            kernel-source: https://files.bwlp.ks.uni-freiburg.de/stuff/centos/linux-5.14.0-362.18.1.el9_3.tar.xz
+          - name: CentOS 9.4 [5.14.0]
+            build-os: ubuntu-22.04
+            kernel-type: centos-tar
+            kernel-source: https://files.bwlp.ks.uni-freiburg.de/stuff/centos/linux-5.14.0-427.el9.tar.xz
+          - name: Vanilla [4.19.x]
+            build-os: ubuntu-22.04
             kernel-type: vanilla
             kernel-version: 4.19.y
-          - name: kernel module [Linux kernel 5.4.x]
-            build-os: ubuntu-20.04
+          - name: Vanilla [5.4.x]
+            build-os: ubuntu-22.04
             kernel-type: vanilla
             kernel-version: 5.4.y
-          - name: kernel module [Linux kernel 5.10.x]
-            build-os: ubuntu-20.04
+          - name: Vanilla [5.10.x]
+            build-os: ubuntu-22.04
             kernel-type: vanilla
             kernel-version: 5.10.y
-          - name: kernel module [Linux kernel 5.15.x]
-            build-os: ubuntu-20.04
+          - name: Vanilla [5.15.x]
+            build-os: ubuntu-22.04
             kernel-type: vanilla
             kernel-version: 5.15.y
-          - name: kernel module [Linux kernel 6.1.x]
+          - name: Vanilla [6.1.x]
             build-os: ubuntu-22.04
             kernel-type: vanilla
             kernel-version: 6.1.y
+          - name: Vanilla [6.6.x]
+            build-os: ubuntu-22.04
+            kernel-type: vanilla
+            kernel-version: 6.6.y
     name: Build dnbd3 ${{ matrix.config.name }}
     runs-on: ${{ matrix.config.build-os }}
     steps:
@@ -54,21 +64,31 @@ jobs:
                                       rpm2cpio \
                                       rpm
       - name: Checkout dnbd3 repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Fetch dnbd3 repository tags
         run: git fetch --prune --unshallow
-      - name: Checkout Vanilla kernel version
+      - name: Checkout Vanilla kernel version [git]
         if: matrix.config.kernel-type == 'vanilla'
         run: git clone --depth 1  --branch "linux-${{ matrix.config.kernel-version }}" "https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git" "../kernel"
-      - name: Checkout CentOS kernel version
-        if: matrix.config.kernel-type == 'centos'
+      - name: Checkout CentOS kernel version [rpm]
+        if: matrix.config.kernel-type == 'centos-rpm'
         run: |
           mkdir "${{ github.workspace }}/../kernel"
           mkdir "${{ github.workspace }}/../kernel-download"
           wget -q -O "${{ github.workspace }}/../kernel-download/kernel.rpm" "${{ matrix.config.kernel-source }}"
           cd "${{ github.workspace }}/../kernel-download"
           rpm2cpio "${{ github.workspace }}/../kernel-download/kernel.rpm" | cpio --extract --make-directories
-          tar --strip 1 -a -x -f linux-${{ matrix.config.kernel-version }}*.tar.xz -C "${{ github.workspace }}/../kernel"
+          tar --strip 1 -a -x -f linux-*.el*.tar.xz -C "${{ github.workspace }}/../kernel"
+          cd
+          rm -rf -- "${{ github.workspace }}/../kernel-download"
+      - name: Checkout CentOS kernel version [tar]
+        if: matrix.config.kernel-type == 'centos-tar'
+        run: |
+          mkdir "${{ github.workspace }}/../kernel"
+          mkdir "${{ github.workspace }}/../kernel-download"
+          wget -q -O "${{ github.workspace }}/../kernel-download/kernel.tar.xz" "${{ matrix.config.kernel-source }}"
+          tar --strip 1 -a -x -f "${{ github.workspace }}/../kernel-download/kernel.tar.xz" -C "${{ github.workspace }}/../kernel"
+          rm -rf -- "${{ github.workspace }}/../kernel-download"
       - name: Configure kernel version
         working-directory: ${{ github.workspace }}/../kernel
         run: |
-- 
cgit v1.2.3-55-g7522