xperimental
/
ffbsee-build
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use patch instead of "git am".

This commit is contained in:
Robert Jacob 2017-07-08 15:51:37 +02:00
parent e1517134d7
commit 04758f674b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Jenkinsfile vendored
View File

@ -11,9 +11,9 @@ node ("make") {
stage('patches') { stage('patches') {
sh "cp -rf firmware/files firmware/package ." sh "cp -rf firmware/files firmware/package ."
sh "git am --whitespace=nowarn firmware/patches/lede/*.patch" sh "for file in firmware/patches/lede/*.patch; do patch -p1 < $file; done"
dir('feeds/routing') { dir('feeds/routing') {
sh "git am --whitespace=nowarn ../../firmware/patches/routing/*.patch" sh "for file in ../../firmware/patches/routing/*.patch; do patch -p1 < $file; done"
} }
} }