diff --git a/Jenkins/master-pipeline/Jenkinsfile b/Jenkins/master-pipeline/Jenkinsfile index 3d7c004..d43c851 100644 --- a/Jenkins/master-pipeline/Jenkinsfile +++ b/Jenkins/master-pipeline/Jenkinsfile @@ -34,9 +34,19 @@ pipeline { 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') { steps { - sh 'llvm-premerge-checks/scripts/run_ninja_check-all.sh' + sh 'llvm-premerge-checks/scripts/run_ninja.sh check-all' } } } diff --git a/scripts/phabtalk/apply_patch.py b/scripts/phabtalk/apply_patch.py index cb0c64b..c5cb3ee 100755 --- a/scripts/phabtalk/apply_patch.py +++ b/scripts/phabtalk/apply_patch.py @@ -37,10 +37,16 @@ def _get_parent_hash(diff_id: str, phab:Phabricator) -> 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): + print('running arc path...') cmd = 'arc patch --nobranch --no-ansi --diff "{}" --nocommit '\ '--conduit-token "{}" --conduit-uri "{}"'.format( diff_id, conduit_token, host )