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

Merge Book into main repo #775

Merged
merged 50 commits into from
Feb 5, 2025

Conversation

Walter-Reactor
Copy link
Contributor

@Walter-Reactor Walter-Reactor commented Jan 27, 2025

This merges the book repository into the diplomat repository proper, which should allow for better maintaining the documentation as well as making it more clear which version of diplomat any particular revision of the book is referring to.

Commit history was edited via git-filter-repo & should be maintained by this PR

Copy link
Contributor

@Manishearth Manishearth left a comment

Choose a reason for hiding this comment

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

Overall looks good, but we should update CI

@@ -0,0 +1,29 @@
name: build
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: this file should be moved to the top level

perhaps, book-deploy.yml

Copy link
Contributor

Choose a reason for hiding this comment

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

and then updated so that it runs in a folder

book/LICENSE Outdated
@@ -0,0 +1,242 @@
Diplomat is licensed under the Apache License, Version 2.0 (included below) or
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: i'd remove the license files

@Manishearth
Copy link
Contributor

Also the nanobind commit made its way into this PR

@Walter-Reactor
Copy link
Contributor Author

Looks like there's some kind of glibc issue with the github setup? I'm not super familiar with github actions

@Manishearth Manishearth closed this Feb 5, 2025
@Manishearth Manishearth reopened this Feb 5, 2025
@Manishearth
Copy link
Contributor

Should be fixed by rebasing, but close/open also works

#768

@Manishearth
Copy link
Contributor

Oh I see the problem. you'll need to copy over the fix from #768 to the new workflow file

@Manishearth
Copy link
Contributor

It's weird that gen CI is failing here when this doesn't touch the main code at all

@Manishearth
Copy link
Contributor

Oh, it's due to two different PRs being merged that conflicted without touching the same files

@Manishearth Manishearth closed this Feb 5, 2025
@Manishearth Manishearth reopened this Feb 5, 2025
push:
branches:
- main
pull_request:
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: this line should be removed

@Manishearth
Copy link
Contributor

This is basically ready to land

@Manishearth Manishearth closed this Feb 5, 2025
@Manishearth Manishearth reopened this Feb 5, 2025
@Walter-Reactor
Copy link
Contributor Author

Looks like there's also been some updates to the github actions upstream. I'm trying out uprevving

@Manishearth Manishearth merged commit 427b619 into rust-diplomat:main Feb 5, 2025
21 checks passed
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.

6 participants