beenull/linux-surface
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source 
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.
This commit is contained in:
Maximilian Luz 2021-07-21 03:24:41 +02:00
parent 18a7379aa4
commit 9bfb27f3e8
No known key found for this signature in database
GPG key ID: 70EC0937F6C26F02
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/debian.yml vendored
View file

@ -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 .

4
.github/workflows/debian_lts.yml vendored
View file

@ -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 .