From 04758f674b46e38aa5fbf70a6c38ba3b4277e800 Mon Sep 17 00:00:00 2001 From: Robert Jacob Date: Sat, 8 Jul 2017 15:51:37 +0200 Subject: [PATCH] Use patch instead of "git am". --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 360b78c..f59d6ab 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,9 +11,9 @@ node ("make") { stage('patches') { 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') { - sh "git am --whitespace=nowarn ../../firmware/patches/routing/*.patch" + sh "for file in ../../firmware/patches/routing/*.patch; do patch -p1 < $file; done" } }