From 217421c8b545b9bd84e6b5dbbe2c7476833b9495 Mon Sep 17 00:00:00 2001 From: Alexander Batashev Date: Sat, 14 Mar 2020 17:18:21 +0300 Subject: [PATCH 1/3] [CI] Allow builds without pre-downloaded OpenCL in configure.py Fixes incorrect merge conflict resolution for #1313. Signed-off-by: Alexander Batashev --- buildbot/configure.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/buildbot/configure.py b/buildbot/configure.py index 9163519b3fae7..60f6c97160e29 100644 --- a/buildbot/configure.py +++ b/buildbot/configure.py @@ -55,8 +55,6 @@ def do_configure(args): "-DLLVM_EXTERNAL_XPTI_SOURCE_DIR={}".format(xpti_dir), "-DLLVM_ENABLE_PROJECTS={}".format(llvm_enable_projects), "-DLIBCLC_TARGETS_TO_BUILD={}".format(libclc_targets_to_build), - "-DOpenCL_INCLUDE_DIR={}".format(ocl_header_dir), - "-DOpenCL_LIBRARY={}".format(icd_loader_lib), "-DSYCL_BUILD_PI_CUDA={}".format(sycl_build_pi_cuda), "-DLLVM_BUILD_TOOLS=ON", "-DSYCL_ENABLE_WERROR=ON", From a13b4c16d34f269ae0e69488a93229a9f24b951a Mon Sep 17 00:00:00 2001 From: Alexander Batashev Date: Sat, 14 Mar 2020 17:22:05 +0300 Subject: [PATCH 2/3] Temporarily run as pre-commit for testing Signed-off-by: Alexander Batashev --- .github/workflows/linux_post_commit.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/linux_post_commit.yml b/.github/workflows/linux_post_commit.yml index 1180493d4dfae..e8f47796c9fb1 100644 --- a/.github/workflows/linux_post_commit.yml +++ b/.github/workflows/linux_post_commit.yml @@ -1,6 +1,9 @@ name: Linux Post Commit Checks on: + pull_request: + branches: + - sycl push: branches: - sycl From 1308933a702eeaa5eb7305a40ef262b354391f92 Mon Sep 17 00:00:00 2001 From: Alexander Batashev Date: Sun, 15 Mar 2020 10:34:19 +0300 Subject: [PATCH 3/3] Revert "Temporarily run as pre-commit for testing" This reverts commit a13b4c16d34f269ae0e69488a93229a9f24b951a. Signed-off-by: Alexander Batashev --- .github/workflows/linux_post_commit.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/linux_post_commit.yml b/.github/workflows/linux_post_commit.yml index e8f47796c9fb1..1180493d4dfae 100644 --- a/.github/workflows/linux_post_commit.yml +++ b/.github/workflows/linux_post_commit.yml @@ -1,9 +1,6 @@ name: Linux Post Commit Checks on: - pull_request: - branches: - - sycl push: branches: - sycl