diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 59c37bc..2c80658 100644 --- 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: |