Skip to content

Conversation

@elizabethandrews
Copy link
Contributor

Signed-off-by: Elizabeth Andrews elizabeth.andrews@intel.com

Signed-off-by: Elizabeth Andrews <elizabeth.andrews@intel.com>
@elizabethandrews elizabethandrews requested a review from a team as a code owner October 17, 2022 15:58
@elizabethandrews
Copy link
Contributor Author

The tests failed because of a merge conflict -

CONFLICT (content): Merge conflict in devops/actions/clang-format/action.yml
:
:
Auto-merging clang/include/clang/Driver/ToolChain.h
Auto-merging clang/include/clang/Driver/Options.td
CONFLICT (content): Merge conflict in clang/include/clang/Driver/Options.td
Auto-merging buildbot/configure.py
CONFLICT (content): Merge conflict in buildbot/configure.py
Auto-merging .github/workflows/sycl_precommit.yml
Auto-merging .github/workflows/sycl_linux_build_and_test.yml
CONFLICT (content): Merge conflict in .github/workflows/sycl_linux_build_and_test.yml
Auto-merging .github/workflows/sycl_containers.yaml
Auto-merging .github/CODEOWNERS
CONFLICT (content): Merge conflict in .github/CODEOWNERS
Automatic merge failed; fix conflicts and then commit the result.

Not sure why because I haven't touched any of those files. Anyway I've updated the branch and hopefully that will fix it.

@elizabethandrews
Copy link
Contributor Author

Ok There seems to be some infrastructure issue. I see other PRs fail with same error as well.

Copy link
Contributor

@Fznamznon Fznamznon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pvchupin , can we enable windows LIT testing in pre-commit?

@pvchupin pvchupin merged commit ffc85b8 into intel:sycl Oct 17, 2022
@pvchupin
Copy link
Contributor

pvchupin commented Oct 17, 2022

@pvchupin , can we enable windows LIT testing in pre-commit?

There is some timing drawback and based on recent discussions it makes sense to implement a reliable for post-commit notifications first. There will be always additional configurations which run post-commit and these will require fast action whether it's Windows or not.
Currently author of the patch is not receiving notifications on post-commit broken.

Part of the discussion is at #6862

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants