Browse Source

pkd/debian: Use 'git am' instead of 'patch' to avoid issues

The patch tool tries to ask questions when a patch fails, which means
automated builds will be waiting for that to time out on errors. Use
'git am' instead. This should also be smarter when applying patches.
Maximilian Luz 4 years ago
parent
commit
9bfb27f3e8
2 changed files with 4 additions and 4 deletions
  1. 2 2
      .github/workflows/debian.yml
  2. 2 2
      .github/workflows/debian_lts.yml

+ 2 - 2
.github/workflows/debian.yml

@@ -49,7 +49,7 @@ jobs:
 
         # apply surface build/packaging patches
         for PATCH in ../*.patch; do
-          patch -p1 < ${PATCH}
+          git am ${PATCH}
         done
 
         git add .
@@ -57,7 +57,7 @@ jobs:
 
         # apply surface patches
         for PATCH in ../../../../patches/${KERNEL_VERSION%.*}/*.patch; do
-          patch -p1 < ${PATCH}
+          git am < ${PATCH}
         done
 
         git add .

+ 2 - 2
.github/workflows/debian_lts.yml

@@ -49,7 +49,7 @@ jobs:
 
         # apply surface build/packaging patches
         for PATCH in ../*.patch; do
-          patch -p1 < ${PATCH}
+          git am ${PATCH}
         done
 
         git add .
@@ -57,7 +57,7 @@ jobs:
 
         # apply surface patches
         for PATCH in ../../../../patches/${KERNEL_VERSION%.*}/*.patch; do
-          patch -p1 < ${PATCH}
+          git am ${PATCH}
         done
 
         git add .