From fb5b2b02d616c9c15234d89f766d94c81f34917c Mon Sep 17 00:00:00 2001 From: cmspam Date: Wed, 15 May 2024 05:50:02 +0900 Subject: [PATCH] Update builds.yml --- .github/workflows/builds.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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: |