diff --git a/Jenkins/Phabricator-pipeline/Jenkinsfile b/Jenkins/Phabricator-pipeline/Jenkinsfile index dd23283..c0f92e6 100644 --- a/Jenkins/Phabricator-pipeline/Jenkinsfile +++ b/Jenkins/Phabricator-pipeline/Jenkinsfile @@ -27,7 +27,7 @@ pipeline { TARGET_DIR = "/mnt/nfs/results/${MY_BUILD_ID}" RESULT_URL = "http://results.llvm-merge-guard.org/${MY_BUILD_ID}" TEST_REPORT = "${WORKSPACE}/build/test-results.xml" - DIFF_JSON = "${WORKSPACE}/diff.json" + DIFF_JSON = "${WORKSPACE}/build/diff.json" } stages { stage("build info"){ @@ -39,7 +39,6 @@ pipeline { steps { git url: 'https://github.com/llvm/llvm-project.git' sh 'git clean -fdx' - sh "python3 ${SCRIPT_DIR}/phabtalk/apply_patch.py" sh 'mkdir -p llvm-premerge-checks' dir("llvm-premerge-checks") { @@ -48,7 +47,12 @@ pipeline { sh 'mkdir -p build' } } - stage('CMake') { + stage('arc patch'){ + steps { + sh "python3 ${SCRIPT_DIR}/phabtalk/apply_patch.py" + } + } + stage('CMake') { steps { sh "${SCRIPT_DIR}/run_cmake.sh" } diff --git a/scripts/phabtalk/apply_patch.py b/scripts/phabtalk/apply_patch.py index 30c6b65..fb0bdb3 100755 --- a/scripts/phabtalk/apply_patch.py +++ b/scripts/phabtalk/apply_patch.py @@ -56,7 +56,7 @@ def _git_checkout(git_hash: str): def _apply_patch(diff_id: str, conduit_token: str, host: str): print('running arc patch...') - cmd = 'arc patch --nobranch --no-ansi --diff "{}" --nocommit '\ + cmd = 'arc patch --force --nobranch --no-ansi --diff "{}" --nocommit '\ '--conduit-token "{}" --conduit-uri "{}"'.format( diff_id, conduit_token, host ) result = subprocess.run(cmd, capture_output=True, shell=True, text=True)