diff --git a/scripts/buildkite/build_branch_pipeline.py b/scripts/buildkite/build_branch_pipeline.py index 0813560..3e7c081 100755 --- a/scripts/buildkite/build_branch_pipeline.py +++ b/scripts/buildkite/build_branch_pipeline.py @@ -39,7 +39,7 @@ if __name__ == '__main__': f'git clone --depth 1 --branch {scripts_branch} https://github.com/google/llvm-premerge-checks.git ' '${SRC}', 'echo "llvm-premerge-checks commit"', - 'git rev-parse HEAD', + 'git --git-dir ${SRC}/.git rev-parse HEAD', 'set +e', # Add link in review to the build. '${SRC}/scripts/phabtalk/add_url_artifact.py ' @@ -73,8 +73,8 @@ if __name__ == '__main__': 'set SRC=%BUILDKITE_BUILD_PATH%/llvm-premerge-checks', 'rm -rf %SRC%', f'git clone --depth 1 --branch {scripts_branch} https://github.com/google/llvm-premerge-checks.git %SRC%', - 'echo "llvm-premerge-checks commit"', - 'git rev-parse HEAD', + 'echo llvm-premerge-checks commit:', + 'git --git-dir %SRC%/.git rev-parse HEAD', 'powershell -command "' f'%SRC%/scripts/premerge_checks.py --projects=\'{projects}\' --log-level={log_level} {filter_output}; ' '\\$exit=\\$?;' diff --git a/scripts/buildkite/build_master_pipeline.py b/scripts/buildkite/build_master_pipeline.py index 808d2e8..ab28efc 100755 --- a/scripts/buildkite/build_master_pipeline.py +++ b/scripts/buildkite/build_master_pipeline.py @@ -23,6 +23,7 @@ if __name__ == '__main__': filter_output = '--filter-output' if os.getenv('ph_no_filter_output') is None else '' projects = os.getenv('ph_projects', 'clang;clang-tools-extra;libc;libcxx;libcxxabi;lld;libunwind;mlir;openmp;polly') log_level = os.getenv('ph_log_level', 'WARNING') + notify_emails = list(filter(None, os.getenv('ph_notify_emails', '').split(','))) steps = [] linux_buld_step = { 'label': ':linux: build and test linux', @@ -38,7 +39,7 @@ if __name__ == '__main__': f'git clone --depth 1 --branch {scripts_branch} https://github.com/google/llvm-premerge-checks.git ' '${SRC}', 'echo "llvm-premerge-checks commit"', - 'git rev-parse HEAD', + 'git --git-dir ${SRC}/.git rev-parse HEAD', 'set +e', f'${{SRC}}/scripts/premerge_checks.py --projects="{projects}" --log-level={log_level} {filter_output}', 'EXIT_STATUS=\\$?', @@ -68,8 +69,8 @@ if __name__ == '__main__': 'set SRC=%BUILDKITE_BUILD_PATH%/llvm-premerge-checks', 'rm -rf %SRC%', f'git clone --depth 1 --branch {scripts_branch} https://github.com/google/llvm-premerge-checks.git %SRC%', - 'echo "llvm-premerge-checks commit"', - 'git rev-parse HEAD', + 'echo llvm-premerge-checks commit:', + 'git --git-dir %SRC%/.git rev-parse HEAD', 'powershell -command "' f'%SRC%/scripts/premerge_checks.py --projects=\'{projects}\' --log-level={log_level} {filter_output}; ' '\\$exit=\\$?;' @@ -95,4 +96,7 @@ if __name__ == '__main__': steps.append(linux_buld_step) if os.getenv('ph_skip_windows') is None: steps.append(windows_buld_step) - print(yaml.dump({'steps': steps})) + notify = [] + for e in notify_emails: + notify.append({'email': e}) + print(yaml.dump({'steps': steps, 'notify': notify}))