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

fix: fix typos using typos #6158

Merged
merged 6 commits into from Jun 30, 2023
Merged

fix: fix typos using typos #6158

merged 6 commits into from Jun 30, 2023

Conversation

suzuki-shunsuke
Copy link
Contributor

Fix typos using typos.

https://github.com/crate-ci/typos

$ typos --version
typos-cli 1.15.7

_typos.toml

[default.extend-words]
servantes = "servantes"
Servantes = "Servantes"
O_WRONLY = "O_WRONLY"
WRONLY = "WRONLY"
whosAGoodBoy = "whosAGoodBoy"
supercede = "supercede"
dne = "dne"
Anser = "Anser"

[default.extend-identifiers]
whosAGoodBoy = "whosAGoodBoy"
whosAGoodCat = "whosAGoodCat"
KubernetesApplys = "KubernetesApplys"
KubernetesDiscoverys = "KubernetesDiscoverys"
ANDed = "ANDed"
TestEncodeYAMLNonYAMLable = "TestEncodeYAMLNonYAMLable"

[files]
extend-exclude = ["vendor/*", "pkg/apis/core/v1alpha1/generated.pb.go", "pkg/snapshot/testdata/snapshot.json", "pkg/snapshot/testdata/snapshot_new.json", "internal/hud/webview/testdata/snapshot.json", "pkg/apis/core/v1alpha1/generated.proto"]
$ typos --no-check-filenames -w

And I fixed some typos manually.

  1. fix a typo "intance" to "instance" b48b261
  2. fix typo "exected" to "expected" fb06417

https://github.com/crate-ci/typos

```console
$ typos --version
typos-cli 1.15.7
```

_typos.toml

```toml
[default.extend-words]
servantes = "servantes"
Servantes = "Servantes"
O_WRONLY = "O_WRONLY"
WRONLY = "WRONLY"
whosAGoodBoy = "whosAGoodBoy"
supercede = "supercede"
dne = "dne"
Anser = "Anser"

[default.extend-identifiers]
whosAGoodBoy = "whosAGoodBoy"
whosAGoodCat = "whosAGoodCat"
KubernetesApplys = "KubernetesApplys"
KubernetesDiscoverys = "KubernetesDiscoverys"
ANDed = "ANDed"
TestEncodeYAMLNonYAMLable = "TestEncodeYAMLNonYAMLable"

[files]
extend-exclude = ["vendor/*", "pkg/apis/core/v1alpha1/generated.pb.go", "pkg/snapshot/testdata/snapshot.json", "pkg/snapshot/testdata/snapshot_new.json", "internal/hud/webview/testdata/snapshot.json", "pkg/apis/core/v1alpha1/generated.proto"]
```

```console
$ typos --no-check-filenames -w
```

Signed-off-by: Shunsuke Suzuki <suzuki.shunsuke.1989@gmail.com>
Signed-off-by: Shunsuke Suzuki <suzuki.shunsuke.1989@gmail.com>
Signed-off-by: Shunsuke Suzuki <suzuki.shunsuke.1989@gmail.com>
@suzuki-shunsuke

This comment was marked as resolved.

Signed-off-by: Shunsuke Suzuki <suzuki.shunsuke.1989@gmail.com>
@suzuki-shunsuke
Copy link
Contributor Author

Signed-off-by: Shunsuke Suzuki <suzuki.shunsuke.1989@gmail.com>
@nicks
Copy link
Member

nicks commented Jun 28, 2023

I think the problem is that some of these aren't typos in tilt - they're typos in upstream projects, and so the code in tilt needs to use the same spelling

@suzuki-shunsuke
Copy link
Contributor Author

Thank you for your comment.
I reverted a fix, then CI succeeded. 770adba

@suzuki-shunsuke suzuki-shunsuke marked this pull request as ready for review June 28, 2023 23:48
// nolint
regexp.MustCompile("(executor failed running.*): runc did not terminate sucessfully"), // sucessfully (sic)
regexp.MustCompile("(executor failed running.*): runc did not terminate successfully"), // successfully (sic)
Copy link
Member

Choose a reason for hiding this comment

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

i think this one needs to be reverted, because the typo is upstream (that's why it's marked sic)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh, I see. Thank you for pointing it out.
I reverted. f800b65

suzuki-shunsuke added a commit to suzuki-shunsuke/tilt that referenced this pull request Jun 30, 2023
tilt-dev#6158 (comment)

> i think this one needs to be reverted, because the typo is upstream

Signed-off-by: Shunsuke Suzuki <suzuki.shunsuke.1989@gmail.com>
suzuki-shunsuke added a commit to suzuki-shunsuke/tilt that referenced this pull request Jun 30, 2023
tilt-dev#6158 (comment)

> i think this one needs to be reverted, because the typo is upstream

Signed-off-by: Shunsuke Suzuki <suzuki.shunsuke.1989@gmail.com>
https://github.com/tilt-dev/tilt/pull/6158/files#r1246768000

> i think this one needs to be reverted, because the typo is upstream (that's why it's marked sic)

Signed-off-by: Shunsuke Suzuki <suzuki.shunsuke.1989@gmail.com>
Copy link
Member

@nicks nicks left a comment

Choose a reason for hiding this comment

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

lgtm! thanks!

@nicks nicks merged commit 8eb9b12 into tilt-dev:master Jun 30, 2023
7 checks passed
@suzuki-shunsuke suzuki-shunsuke deleted the typos-3 branch June 30, 2023 22:39
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.

None yet

2 participants