Update builds.yml

cmspam · May 14, 2024 · 448e890 · 448e890
1 parent fb5b2b0
commit 448e890
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
@@ -29,7 +29,9 @@ jobs:
     - name: Apply Incus Patches
       run: |
         cd lxd-ui
-        git am --ignore-whitespace --3way ../incus/patches/ui-canonical-*.patch || git am --abort
+        for patch in ../incus/patches/ui-canonical-*.patch; do
+          git apply --reject --whitespace=fix $patch
+        done
         
     - name: Rename Files
       run: |