Merge branch 'main' into nega-nv

ublue-os · Jun 27, 2024 · bdf0fe9 · bdf0fe9
2 parents b7bf452 + 782ea95
commit bdf0fe9
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 3 deletions.
diff --git a/.github/workflows/build-39.yml b/.github/workflows/build-39.yml
@@ -3,7 +3,7 @@ on:
   pull_request:
   merge_group:
   schedule:
-    - cron: '0 14 * * *'  # 2pm-ish UTC everyday (timed against official fedora container pushes, and after 'config')
+    - cron: '0 2 * * *'  # 2am-ish UTC everyday (timed against official fedora container pushes, and after 'config')
   workflow_dispatch:
 
 jobs:

diff --git a/.github/workflows/build-40.yml b/.github/workflows/build-40.yml
@@ -3,7 +3,7 @@ on:
   pull_request:
   merge_group:
   schedule:
-    - cron: '5 14 * * *'  # 2pm-ish UTC everyday (timed against official fedora container pushes, and after 'config')
+    - cron: '5 2 * * *'  # 2am-ish UTC everyday (timed against official fedora container pushes, and after 'config')
   workflow_dispatch:
 
 jobs:

diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml
@@ -33,11 +33,16 @@ jobs:
           - fsync
           - fsync-lts
           - surface
+          - coreos
         cfile_suffix:
           - common
           - extra
           - nvidia
         exclude:
+          - fedora_version: 39
+            kernel_flavor: fsync
+          - fedora_version: 39
+            kernel_flavor: asus
           - fedora_version: 40
             kernel_flavor: fsync-lts # kernel-ba packages are not being built for F40 yet.
     steps:
@@ -159,6 +164,9 @@ jobs:
                 $dnf config-manager --add-repo=https://pkg.surfacelinux.com/fedora/linux-surface.repo
                 linux=$($dnf repoquery --repoid linux-surface --whatprovides kernel-surface | tail -n1 | sed 's/.*://')
                 ;;
+              "coreos")
+                linux=$(skopeo inspect docker://quay.io/fedora/fedora-coreos:stable | jq -r '.Labels["ostree.linux"] | split(".x86_64")[0]')
+                ;;
               *)
                 echo "unexpected kernel_flavor '${{ matrix.kernel_flavor }}' for dnf repoquery"
                 ;;
@@ -215,7 +223,6 @@ jobs:
         with:
           string: ${{ env.IMAGE_REGISTRY }}
 
-
       - name: Push To GHCR
         uses: Wandalen/[email protected]
         id: push

diff --git a/build-prep.sh b/build-prep.sh
@@ -106,6 +106,18 @@ elif [[ "surface" == "${KERNEL_FLAVOR}" ]]; then
         --install kernel-surface-modules \
         --install kernel-surface-modules-core \
         --install kernel-surface-modules-extra
+elif [[ "coreos" == "${KERNEL_FLAVOR}" ]] && \
+     [[ -n "${KERNEL_VERSION}" ]]; then
+    echo "Installing CoreOS Kernel"
+    KERNEL_MAJOR_MINOR_PATCH=$(echo $KERNEL_VERSION | cut -d '-' -f 1)
+    KERNEL_RELEASE=$(echo $KERNEL_VERSION | cut -d '-' -f 2)
+    rpm-ostree cliwrap install-to-root /
+    rpm-ostree override replace --experimental \
+        https://kojipkgs.fedoraproject.org//packages/kernel/$KERNEL_MAJOR_MINOR_PATCH/$KERNEL_RELEASE/x86_64/kernel-$KERNEL_MAJOR_MINOR_PATCH-$KERNEL_RELEASE.x86_64.rpm \
+        https://kojipkgs.fedoraproject.org//packages/kernel/$KERNEL_MAJOR_MINOR_PATCH/$KERNEL_RELEASE/x86_64/kernel-core-$KERNEL_MAJOR_MINOR_PATCH-$KERNEL_RELEASE.x86_64.rpm \
+        https://kojipkgs.fedoraproject.org//packages/kernel/$KERNEL_MAJOR_MINOR_PATCH/$KERNEL_RELEASE/x86_64/kernel-modules-$KERNEL_MAJOR_MINOR_PATCH-$KERNEL_RELEASE.x86_64.rpm \
+        https://kojipkgs.fedoraproject.org//packages/kernel/$KERNEL_MAJOR_MINOR_PATCH/$KERNEL_RELEASE/x86_64/kernel-modules-core-$KERNEL_MAJOR_MINOR_PATCH-$KERNEL_RELEASE.x86_64.rpm \
+        https://kojipkgs.fedoraproject.org//packages/kernel/$KERNEL_MAJOR_MINOR_PATCH/$KERNEL_RELEASE/x86_64/kernel-modules-extra-$KERNEL_MAJOR_MINOR_PATCH-$KERNEL_RELEASE.x86_64.rpm
 elif [[ "main" == "${KERNEL_FLAVOR}" ]] && \
      [[ "" != "${KERNEL_VERSION}" ]]; then
     echo "main kernel version ${KERNEL_VERSION} to avoid upgrading kernel beyond what is in the image."