Update builds.yml

cmspam · May 14, 2024 · fb5b2b0 · fb5b2b0
1 parent 5ec04e2
commit fb5b2b0
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
@@ -28,10 +28,8 @@ jobs:
 
     - name: Apply Incus Patches
       run: |
-        cd incus/patches
-        for patch in ui-canonical-*; do
-          git apply --directory="../../lxd-ui" $patch
-        done
+        cd lxd-ui
+        git am --ignore-whitespace --3way ../incus/patches/ui-canonical-*.patch || git am --abort
         
     - name: Rename Files
       run: |