Avoid renames as rename detection struggles with copypaste to test files

nextmcloud · Sep 7, 2023 · faff40c · faff40c
1 parent cc79c28
commit faff40c
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/.github/workflows/nmc-custom-server-build.yml b/.github/workflows/nmc-custom-server-build.yml
@@ -51,7 +51,9 @@ env:
     /.*
     !/.gitignore
     !/.nextcloudignore
-    /composer.*
+    composer.json
+    composer.lock
+    composer.phar
     package.json
     package-lock.json
     webpack.*
@@ -155,7 +157,7 @@ jobs:
           # locally add build changes, no push
           git add -A
           git commit -m "Temp add"
-          git diff --patch --diff-filter=d --merge-base ${{ inputs.stable }} \
+          git diff --patch --diff-filter=d --merge-base --no-renames ${{ inputs.stable }} \
               ${{ inputs.assembly }} -- > ${RUNNER_TEMP}/custom-server.patch
           gzip -9 ${RUNNER_TEMP}/custom-server.patch
           # clean changes, just to avoid mess - but not absolutely necessary