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

Proposal: Replace bundled gtest directory with Git submodule #721

Merged
merged 3 commits into from
Jun 8, 2020
Merged

Proposal: Replace bundled gtest directory with Git submodule #721

merged 3 commits into from
Jun 8, 2020

Conversation

shymega
Copy link

@shymega shymega commented May 30, 2020

This PR replaces the bundled /ext/gtest directory with a Git submodule locked at the same release as before - 1.6.0 - but it should be considered to bump the release in the near future when and if possible.

Thoughts?

@shymega
Copy link
Author

shymega commented May 30, 2020

Oh, I can see CI is failing. Probably because the CI scripts don't initialise and pull Git submodules. Will look into it.

@shymega
Copy link
Author

shymega commented May 30, 2020

OK, that looks like it works with CI now. Thoughts, anyone? CC: @the-wes, @p12tic

@shymega
Copy link
Author

shymega commented May 30, 2020

Just removed the ext/gmock directory, as the new ext/gtest submodule actually contains both Google Mock and Google Test now. So we'll need to factor that into the testing as well, and possibly consider whenever to keep either/both of them.

@shymega
Copy link
Author

shymega commented May 30, 2020

Oh, wait, that's a mistake.. v1.6.0 hasn't made that change yet. I messed up there.

OK, will revert that last commit, and add gmock again. Sorry!

@shymega
Copy link
Author

shymega commented May 30, 2020

OK, made some more mistakes, but should be fixed now. I've locked Google Mocking at v1.6.0.

To give some clarification, Google Testing now has mocking in the same project, and the Google Mock repo is now archived, but the v1.6.0 tag still exists.

I've created another Git submodule for gmock. My previous commits were mistaken, and I had messed it up a bit. Its late at night for me, and I think my code quality is suffering!

@shymega
Copy link
Author

shymega commented May 30, 2020

Possibly should squash those last few commits into one..

@p12tic
Copy link
Member

p12tic commented Jun 2, 2020

Possibly should squash those last few commits into one..

Yeah, I really need git rebase master in this case :)

@shymega
Copy link
Author

shymega commented Jun 2, 2020

I was just gonna squash and merge with the GitHub UI tbh.

@shymega
Copy link
Author

shymega commented Jun 6, 2020

Merging in a sec. Is that alright, @p12tic - we good to go?

@shymega shymega added build-infra Build infrastructure bugs/PRs enhancement New feature or request labels Jun 7, 2020
@p12tic
Copy link
Member

p12tic commented Jun 8, 2020

Rebased on latest master. Looking into commits again, not all commits need squashing, as that would remove information.

@p12tic p12tic merged commit 00f2b1f into debauchee:master Jun 8, 2020
@shymega shymega deleted the enhance/make-gtest-submodule branch June 8, 2020 16:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build-infra Build infrastructure bugs/PRs enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants