From 9bfb27f3e8ddc83be3c58be5d0000b724498cd93 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Wed, 21 Jul 2021 03:24:41 +0200 Subject: [PATCH] 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. --- .github/workflows/debian.yml | 4 ++-- .github/workflows/debian_lts.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index 23bb1511f..27b343753 100644 --- a/.github/workflows/debian.yml +++ b/.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 . diff --git a/.github/workflows/debian_lts.yml b/.github/workflows/debian_lts.yml index ebdf24f83..87d5f3976 100644 --- a/.github/workflows/debian_lts.yml +++ b/.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 .