re-enable F40 build, no matrix in cache-kernel

ublue-os · Feb 2, 2025 · d2cfb77 · d2cfb77
1 parent 548ba7f
commit d2cfb77
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 40 deletions.
diff --git a/.github/workflows/build-40.yml b/.github/workflows/build-40.yml
@@ -0,0 +1,30 @@
+name: ublue akmods 40
+on:
+  merge_group:
+  pull_request:
+    branches:
+      - main
+    paths-ignore:
+      - '**.md'
+  schedule:
+    - cron: '25 0 * * *'  # 0025 UTC everyday (20 minutes after 41)
+  workflow_dispatch:
+
+
+jobs:
+  kernel-akmods:
+    uses: ./.github/workflows/reusable-build.yml
+    secrets: inherit
+    strategy:
+      fail-fast: false
+      matrix:
+        fedora_version:
+          - 40
+        kernel_flavor:
+          - surface
+          - main
+          - coreos-stable
+          - coreos-testing
+    with:
+      fedora_version: ${{ matrix.fedora_version }}
+      kernel_flavor: ${{ matrix.kernel_flavor }}
diff --git a/.github/workflows/build-40.yml-disabled b/.github/workflows/build-40.yml-disabled
diff --git a/.github/workflows/build-41.yml b/.github/workflows/build-41.yml
@@ -7,7 +7,7 @@ on:
     paths-ignore:
       - '**.md'
   schedule:
-    - cron: '15 0 * * *'  # 10 minutes after kernel-cache
+    - cron: '5 0 * * *'  # 0005 UTC everyday
   workflow_dispatch:
 
 jobs:

diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml
@@ -22,23 +22,11 @@ jobs:
   cache-kernel:
     name: Kernel ${{ inputs.fedora_version }}-${{ inputs.kernel_flavor }}
     runs-on: ubuntu-24.04
-    strategy:
-      fail-fast: false
-      matrix:
-        fedora_version:
-          - ${{ inputs.fedora_version }}
-        kernel_flavor:
-          - ${{ inputs.kernel_flavor }}
-        exclude:
-          - fedora_version: 40
-            kernel_flavor: asus
-          - fedora_version: 40
-            kernel_flavor: bazzite
     env:
       KCWD: /tmp/kernel-cache
       KCPATH: kernel_cache
     outputs:
-      KCKEY: ${{ matrix.kernel_flavor }}-${{ steps.kernel-version.outputs.kernel_release }}
+      KCKEY: ${{ inputs.kernel_flavor }}-${{ steps.kernel-version.outputs.kernel_release }}
       KCWD: ${{ env.KCWD }}
       KCPATH: ${{ env.KCPATH }}
       kernel_build_tag: ${{ steps.kernel-version.outputs.kernel_build_tag }}
@@ -53,15 +41,15 @@ jobs:
         id: kernel-version
         uses: ./.github/actions/get-kernel-version
         with:
-          fedora_version: ${{ matrix.fedora_version}}
-          kernel_flavor: ${{ matrix.kernel_flavor }}
+          fedora_version: ${{ inputs.fedora_version}}
+          kernel_flavor: ${{ inputs.kernel_flavor }}
 
       - name: Cache Kernel RPMs
         id: cache-kernel
         uses: actions/cache@v4
         with:
           path: ${{ env.KCPATH }}
-          key: ${{ matrix.kernel_flavor }}-${{ steps.kernel-version.outputs.kernel_release }} # job outputs KCKEY
+          key: ${{ inputs.kernel_flavor }}-${{ steps.kernel-version.outputs.kernel_release }} # job outputs KCKEY
 
       - name: Retrieve Signing Key
         if: steps.cache-kernel.outputs.cache-hit != 'true' && github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || github.event_name == 'merge_group'
@@ -83,7 +71,7 @@ jobs:
         if: steps.cache-kernel.outputs.cache-hit != 'true'
         shell: bash
         run: |
-          build_image="quay.io/fedora/fedora:${{ matrix.fedora_version }}"
+          build_image="quay.io/fedora/fedora:${{ inputs.fedora_version }}"
           podman pull "$build_image"
 
           mkdir -p ${{ env.KCWD }}
@@ -94,10 +82,10 @@ jobs:
           container_name="fq-$(uuidgen)"
           podman run \
             --entrypoint /bin/bash \
-            --env FEDORA_VERSION=${{ matrix.fedora_version }} \
+            --env FEDORA_VERSION=${{ inputs.fedora_version }} \
             --env KERNEL_BUILD_TAG=${{ steps.kernel-version.outputs.kernel_build_tag }} \
             --env KERNEL_VERSION=${{ steps.kernel-version.outputs.kernel_release }} \
-            --env KERNEL_FLAVOR=${{ matrix.kernel_flavor }} \
+            --env KERNEL_FLAVOR=${{ inputs.kernel_flavor }} \
             --env DUAL_SIGN=true \
             --name "$container_name" \
             -v ${{ env.KCWD }}:${{ env.KCWD }}:rw \
@@ -118,7 +106,7 @@ jobs:
           fi
 
           cd ${{ env.KCWD }}/rpms
-          if [[ "${{ matrix.kernel_flavor }}" == "surface" ]]; then
+          if [[ "${{ inputs.kernel_flavor }}" == "surface" ]]; then
             rpm2cpio kernel-surface-core-"${{ steps.kernel-version.outputs.kernel_release }}".rpm | cpio -idmv
           else
             rpm2cpio kernel-core-"${{ steps.kernel-version.outputs.kernel_release }}".rpm | cpio -idmv