From ac2fcc5944c79fc85a143cb13d8ebec7d15689a2 Mon Sep 17 00:00:00 2001
From: Mikhail Goncharov <goncharov.mikhail@gmail.com>
Date: Wed, 5 Feb 2020 10:13:37 +0100
Subject: [PATCH] use new apply-patch for linux

---
 Jenkins/Phabricator-pipeline/Jenkinsfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Jenkins/Phabricator-pipeline/Jenkinsfile b/Jenkins/Phabricator-pipeline/Jenkinsfile
index 23f071d..94a5eab 100644
--- a/Jenkins/Phabricator-pipeline/Jenkinsfile
+++ b/Jenkins/Phabricator-pipeline/Jenkinsfile
@@ -63,6 +63,7 @@ pipeline {
         stage("git checkout"){
             steps {
                 git url: 'https://github.com/llvm/llvm-project.git'
+                sh 'git reset --hard origin/master'  // To remove any local commits to master.
                 sh 'git clean -fdx'
                 sh 'git show -s'
                 sh 'mkdir -p llvm-premerge-checks'
@@ -77,7 +78,8 @@ pipeline {
         }
         stage('arc patch'){
             steps {
-                sh "python3 ${SCRIPT_DIR}/phabtalk/apply_patch.py --comment-file ${PHAB_LOG}"
+//                 sh "python3 ${SCRIPT_DIR}/phabtalk/apply_patch.py --comment-file ${PHAB_LOG}"
+                sh "${SCRIPT_DIR}/phabtalk/apply_patch2.py ${DIFF_ID} --token ${CONDUIT_TOKEN} --url ${PHABRICATOR_HOST} --comment-file ${PHAB_LOG}"
             }
         }
         stage('CMake') {