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

added error handling to patch script

Browse source
This commit is contained in:
Christian Kühnel 2019-10-23 06:39:24 -07:00
commit e59db9cbcd
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Jenkins/master-pipeline/Jenkinsfile vendored
View file

@ -34,9 +34,19 @@ pipeline {
sh 'llvm-premerge-checks/scripts/run_cmake.sh' sh 'llvm-premerge-checks/scripts/run_cmake.sh'
} }
} }
stage('ninja all') {
steps {
sh 'llvm-premerge-checks/scripts/run_ninja.sh all'
}
}
stage('ninja check') {
steps {
sh 'llvm-premerge-checks/scripts/run_ninja.sh check'
}
}
stage('ninja check-all') { stage('ninja check-all') {
steps { steps {
sh 'llvm-premerge-checks/scripts/run_ninja_check-all.sh' sh 'llvm-premerge-checks/scripts/run_ninja.sh check-all'
} }
} }
} }

8
scripts/phabtalk/apply_patch.py
View file

@ -37,10 +37,16 @@ def _get_parent_hash(diff_id: str, phab:Phabricator) -> str:
def _git_checkout(git_hash:str): def _git_checkout(git_hash:str):
subprocess.check_call('git reset --hard {}'.format(git_hash), shell=True) try:
print('Checking out git hash {}'.format(hash))
subprocess.check_call('git reset --hard {}'.format(git_hash), shell=True)
except subprocess.CalledProcessError:
print('ERROR: checkout failed, using master instead.')
subprocess.check_call('git checkout master')
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 path...')
cmd = 'arc patch --nobranch --no-ansi --diff "{}" --nocommit '\ cmd = 'arc patch --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 )