ci: more robust patch workflow

milas · May 30, 2024 · 747b02b · 747b02b
1 parent 5157fef
commit 747b02b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -92,7 +92,15 @@ jobs:
       - name: Patch upstream Talos
         working-directory: talos
         run: |
-          git apply ../hack/patches/talos/*.patch
+          git config --global user.email "ci-noreply@milas.dev"
+          git config --global user.name "Build User"
+          find ../hack/patches/talos \
+            -name '*.patch' \
+            -type f \
+            -print0 \
+          | sort -z \
+          | xargs -r0 git am --whitespace=fix
+
       - name: Build RK3588 Talos imager
         id: build-imager
         run: |

diff --git a/hack/patches/talos/0001-initramfs-kernel-modules.patch b/hack/patches/talos/0001-initramfs-kernel-modules.patch
@@ -1,8 +1,11 @@
-commit b40f5a8dd43c586183befc1d887353891cf3d054
-Author: Milas Bowman <devnull@milas.dev>
-Date:   Wed May 29 17:56:58 2024 -0400
+From cab0fca0db26c387d14c4dfcd7054cb252a9f44e Mon Sep 17 00:00:00 2001
+From: Milas Bowman <devnull@milas.dev>
+Date: Thu, 30 May 2024 12:47:47 -0400
+Subject: [PATCH] HACK(rock5): remove non-existent kernel modules
 
-    HACK(rock5): remove non-existent kernel modules
+---
+ hack/modules-arm64.txt | 28 ----------------------------
+ 1 file changed, 28 deletions(-)
 
 diff --git a/hack/modules-arm64.txt b/hack/modules-arm64.txt
 index 3b0720302..65b73bf15 100644
@@ -51,3 +54,6 @@ index 3b0720302..65b73bf15 100644
  kernel/net/ipv4/ip_gre.ko
  kernel/net/openvswitch/vport-gre.ko
  kernel/net/tls/tls.ko
+-- 
+2.44.1
+