Skip to content

Fixes for Snooty build #45

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

Merged
merged 6 commits into from
Jul 31, 2023
Merged

Conversation

ccho-mongodb
Copy link
Contributor

Fixes to allow for snooty builds.

Similar changes to be applied to v2.16 and v2.17 branches.

Copy link
Contributor

@schmalliso schmalliso left a comment

Choose a reason for hiding this comment

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

You're also going to need to add the submodule in 😁. https://github.com/mongodb/docs-ruby/pull/21/files has a good example of what I did for master; you'll need to do the same but with the relevant branch here.

@ccho-mongodb ccho-mongodb requested a review from schmalliso July 31, 2023 13:54
@ccho-mongodb
Copy link
Contributor Author

Thanks, added the .gitmodules for the appropriate branch.
@schmalliso could you take another look when you get the chance? Thanks!

@schmalliso
Copy link
Contributor

Sorry for the confusion -- the submodule needs to be added using git submodule add rather than by editing the .gitmodules directly. Once you add those and commit the resulting files, we should be good to go.

@schmalliso
Copy link
Contributor

Looks good - I've staged and everything seems to be hunky dory.
Preview: https://docs-mongodbcom-staging.corp.mongodb.com/ruby-driver/docsworker-xlarge/moduiletest/
Log: https://workerpool-boxgs.mongodbstitch.com/pages/job.html?collName=queue&jobId=64c7cc0487b3b3604698b107

Copy link
Contributor

@schmalliso schmalliso left a comment

Choose a reason for hiding this comment

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

LGTM % that odd indentation in the submodule which is mysterious.

.gitmodules Outdated
[submodule "mongo-ruby-driver"]
path = mongo-ruby-driver
url = https://github.com/mongodb/mongo-ruby-driver.git
branch = 2.18-stable
Copy link
Contributor

Choose a reason for hiding this comment

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

the indentation went weird here, but it still seems to work…

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think git seems to have two different behaviors for indenting when using "git submodule add -b" vs "git checkout" in the submodule directory. I fixed the indentation so that it matches for all lines.

@ccho-mongodb ccho-mongodb merged commit 4c34ee8 into mongodb:v2.18 Jul 31, 2023
This was referenced Jul 31, 2023
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.

2 participants