Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sl/google test #1726

Merged
merged 17 commits into from
Sep 1, 2022
Merged

Sl/google test #1726

merged 17 commits into from
Sep 1, 2022

Conversation

xinlipn
Copy link
Contributor

@xinlipn xinlipn commented Aug 30, 2022

New changes were made on PR1611 after it's tagged as TESTING_CI_PASSED, which seems to causing merge/conflict. This seems to be an issue with the merge process.

Therefore, a new PR is created to include the changes and resolve conflicts if any.

@xinlipn xinlipn self-assigned this Aug 30, 2022
@junliume
Copy link
Collaborator

junliume commented Sep 1, 2022

Redo of #1611 refer to that PR for review comments history

@junliume junliume merged commit dd14f09 into develop Sep 1, 2022
@atamazov
Copy link
Contributor

atamazov commented Sep 1, 2022

@xinlipn @junliume

New changes were made on PR1611 after it's tagged as TESTING_CI_PASSED, which seems to causing merge/conflict. This seems to be an issue with the merge process.

Therefore, a new PR is created to include the changes and resolve conflicts if any.

There is no merge conflicts in #1611. I do not see any differences vs this PR either (except one filename -- hello_gtest.cpp vs hello_test.cpp). Therefor I think that the root reason of the issue with #1611 is not known yet.

@junliume
Copy link
Collaborator

junliume commented Sep 1, 2022

@xinlipn @junliume

New changes were made on PR1611 after it's tagged as TESTING_CI_PASSED, which seems to causing merge/conflict. This seems to be an issue with the merge process.
Therefore, a new PR is created to include the changes and resolve conflicts if any.

There is no merge conflicts in #1611. I do not see any differences vs this PR either (except one filename -- hello_gtest.cpp vs hello_test.cpp). Therefor I think that the root reason of the issue with #1611 is not known yet.

CC: @JehandadKhan
I think it's related to a change in docker register recently via #1696 one has to merge most recent develop branch to ensure the CI will pass.

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.

3 participants