revi-archive/llvm-premerge-checks
1
0
Fork 0
Code Activity

running arc patch with --force

Browse source
This commit is contained in:
Christian Kühnel 2019-11-18 17:02:24 +01:00
parent d12c25cfba
commit 65a9b864d2
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Jenkins/Phabricator-pipeline/Jenkinsfile vendored
View file

@ -27,7 +27,7 @@ pipeline {
TARGET_DIR = "/mnt/nfs/results/${MY_BUILD_ID}" TARGET_DIR = "/mnt/nfs/results/${MY_BUILD_ID}"
RESULT_URL = "http://results.llvm-merge-guard.org/${MY_BUILD_ID}" RESULT_URL = "http://results.llvm-merge-guard.org/${MY_BUILD_ID}"
TEST_REPORT = "${WORKSPACE}/build/test-results.xml" TEST_REPORT = "${WORKSPACE}/build/test-results.xml"
DIFF_JSON = "${WORKSPACE}/diff.json" DIFF_JSON = "${WORKSPACE}/build/diff.json"
} }
stages { stages {
stage("build info"){ stage("build info"){
@ -39,7 +39,6 @@ pipeline {
steps { steps {
git url: 'https://github.com/llvm/llvm-project.git' git url: 'https://github.com/llvm/llvm-project.git'
sh 'git clean -fdx' sh 'git clean -fdx'
sh "python3 ${SCRIPT_DIR}/phabtalk/apply_patch.py"
sh 'mkdir -p llvm-premerge-checks' sh 'mkdir -p llvm-premerge-checks'
dir("llvm-premerge-checks") dir("llvm-premerge-checks")
{ {
@ -48,6 +47,11 @@ pipeline {
sh 'mkdir -p build' sh 'mkdir -p build'
} }
} }
stage('arc patch'){
steps {
sh "python3 ${SCRIPT_DIR}/phabtalk/apply_patch.py"
}
}
stage('CMake') { stage('CMake') {
steps { steps {
sh "${SCRIPT_DIR}/run_cmake.sh" sh "${SCRIPT_DIR}/run_cmake.sh"

2
scripts/phabtalk/apply_patch.py
View file

@ -56,7 +56,7 @@ def _git_checkout(git_hash: str):
def _apply_patch(diff_id: str, conduit_token: str, host: str): def _apply_patch(diff_id: str, conduit_token: str, host: str):
print('running arc patch...') 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( '--conduit-token "{}" --conduit-uri "{}"'.format(
diff_id, conduit_token, host ) diff_id, conduit_token, host )
result = subprocess.run(cmd, capture_output=True, shell=True, text=True) result = subprocess.run(cmd, capture_output=True, shell=True, text=True)