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

[Ulysses tutorial] typos #7024

Merged
merged 1 commit into from
Feb 12, 2025
Merged

[Ulysses tutorial] typos #7024

merged 1 commit into from
Feb 12, 2025

Conversation

stas00
Copy link
Collaborator

@stas00 stas00 commented Feb 11, 2025

Fix typos

@stas00
Copy link
Collaborator Author

stas00 commented Feb 11, 2025

What is this new DCO thing?

I created this PR via github directly so I'm not sure what is missing as the instructions don't apply to gh workflow.

@loadams
Copy link
Collaborator

loadams commented Feb 11, 2025

What is this new DCO thing?

I created this PR via github directly so I'm not sure what is missing as the instructions don't apply to gh workflow.

I've had issues with DCO with using GH to resolve merge conflicts too, all commits have to be signed off, so it needs to include the -s with the commit, which I haven't found a way to enable in the GH GUI. But DCO replaces the CLA when moving from Microsoft to LF.

@tjruwase
Copy link
Contributor

I typically override as follows:

Click details
image

Click "Set to Pass"
image

@tjruwase tjruwase added this pull request to the merge queue Feb 11, 2025
@stas00
Copy link
Collaborator Author

stas00 commented Feb 11, 2025

so basically DCO isn't compatible with github-based commits?

@stas00
Copy link
Collaborator Author

stas00 commented Feb 11, 2025

do we really need a CLA? It's no longer a company owned project - perhaps it can be just dropped, no?

@tjruwase
Copy link
Contributor

so basically DCO isn't compatible with github-based commits?

The docs claim that -s on git commit avoids this. I have been trying to do that, but still forget quite often.
image

@loadams
Copy link
Collaborator

loadams commented Feb 11, 2025

do we really need a CLA? It's no longer a company owned project - perhaps it can be just dropped, no?

@stas00 This is a requirement from the Linux Foundation for their projects.

@loadams
Copy link
Collaborator

loadams commented Feb 11, 2025

so basically DCO isn't compatible with github-based commits?

The docs claim that -s on git commit avoids this. I have been trying to do that, but still forget quite often. image

Yes, when remembering this is fine, otherwise you have to rebase and sign the commits that way. I've not found a way to add the -s when using the GitHub interface though

@stas00
Copy link
Collaborator Author

stas00 commented Feb 12, 2025

@stas00 This is a requirement from the Linux Foundation for their projects.

but then can you override it if it's a requirement? #7024 (comment)

@stas00
Copy link
Collaborator Author

stas00 commented Feb 12, 2025

but my commit is signed as far as github goes! it has the verified check mark next to my commit.

I suppose it just doesn't bother to add the header and so non-native GH apps fail to match the expectations.

A bug in GH?

@loadams
Copy link
Collaborator

loadams commented Feb 12, 2025

@stas00 This is a requirement from the Linux Foundation for their projects.

but then can you override it if it's a requirement? #7024 (comment)

Having DCO as a policy is the requirement. I think the fact that you can override the DCO bot means roughly the same thing as signing off on the commit but I'm not sure.

@loadams
Copy link
Collaborator

loadams commented Feb 12, 2025

but my commit is signed as far as github goes! it has the verified check mark next to my commit.

I suppose it just doesn't bother to add the header and so non-native GH apps fail to match the expectations.

A bug in GH?

I think it is that it doesn't pass the -s flag. I suspect" if your commit message on GH contained the "Signed-off-by: Random J Developer [email protected]" at the end, it might work?

@stas00
Copy link
Collaborator Author

stas00 commented Feb 12, 2025

we don't know how it performs the online commits, probably not using cli? don't know.

but no, if you look at this, there is no signed-off header
https://github.com/deepspeedai/DeepSpeed/commit/c1283f0d8c3c088a4bb5567f7fc557109ae3d333.patch
it doesn't bother with it, since it already knows it's signed off as the commit was done via an authenticated online account.

but the problem is that this breaks other non-native apps that want this header.

@loadams
Copy link
Collaborator

loadams commented Feb 12, 2025

I think there is a difference between the actual signing of the commit and the "signed off" for DCO though, since this commit was signed off on the command line, but I think all the DCO bot is looking for is the "Signed-off-by" in the commit body?

Merged via the queue into master with commit a5b6395 Feb 12, 2025
2 checks passed
@tjruwase tjruwase deleted the stas00-patch-1 branch February 12, 2025 01:13
gyou2021 pushed a commit to gyou2021/DeepSpeed that referenced this pull request Feb 18, 2025
gyou2021 pushed a commit to gyou2021/DeepSpeed that referenced this pull request Feb 18, 2025
gyou2021 pushed a commit to gyou2021/DeepSpeed that referenced this pull request Feb 28, 2025
tohtana pushed a commit that referenced this pull request Feb 28, 2025
Fix typos

Signed-off-by: Masahiro Tanaka <[email protected]>
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