docker / cli

The Docker CLI
Apache License 2.0
4.88k stars 1.92k forks source link

docstring: typo: settings -> setting #5054

Closed zipperer closed 5 months ago

zipperer commented 5 months ago
docstring: typo: replace 'settings' with 'setting' to make subject and verb agree
codecov-commenter commented 5 months ago

Codecov Report

All modified and coverable lines are covered by tests :white_check_mark:

Project coverage is 61.07%. Comparing base (647ccf3) to head (b7e25a4). Report is 5 commits behind head on master.

Additional details and impacted files ```diff @@ Coverage Diff @@ ## master #5054 +/- ## ======================================= Coverage 61.06% 61.07% ======================================= Files 295 295 Lines 20667 20667 ======================================= + Hits 12621 12623 +2 + Misses 7147 7146 -1 + Partials 899 898 -1 ```
thaJeztah commented 5 months ago

Thank you for contributing! It appears your commit message is missing a DCO sign-off, causing the DCO check to fail.

We require all commit messages to have a Signed-off-by line with your name and e-mail (see "Sign your work" in the CONTRIBUTING.md in this repository), which looks something like:

Signed-off-by: YourFirsName YourLastName <yourname@example.org>

There is no need to open a new pull request, but to fix this (and make CI pass), you need to amend the commit(s) in this pull request, and "force push" the amended commit.

Unfortunately, it's not possible to do so through GitHub's web UI, so this needs to be done through the git commandline.

You can find some instructions in the output of the DCO check (which can be found in the "checks" tab on this pull request), as well as in the Moby contributing guide.

Steps to do so "roughly" come down to:

  1. Set your name and e-mail in git's configuration:

    git config --global user.name "YourFirstName YourLastName"
    git config --global user.email "yourname@example.org"

    (Make sure to use your real name (not your GitHub username/handle) and e-mail)

  2. Clone your fork locally

  3. Check out the branch associated with this pull request

  4. Sign-off and amend the existing commit(s)

    git commit --amend --no-edit --signoff

    If your pull request contains multiple commits, either squash the commits (if needed) or sign-off each individual commit.

  5. Force push your branch to GitHub (using the --force or --force-with-lease flags) to update the pull request.

Sorry for the hassle (I wish GitHub would make this a bit easier to do), and let me know if you need help or more detailed instructions!

zipperer commented 5 months ago

@thaJeztah Thank you for the clear instructions.

I intend b7e25a4 has the line for Signed-off-by, and I thereby certify the commit meets the requirements of the Developer Certificate of Origin.

thaJeztah commented 5 months ago

Thanks!

Looks like a flaky test; it was tracked in https://github.com/docker/cli/issues/4356, but should've been fixed by https://github.com/docker/cli/pull/4394 ? I triggered CI to do another run.

64.91 === FAIL: cli/connhelper/commandconn TestCloseRunningCommand (5.00s)
64.91     commandconn_unix_test.go:57: assertion failed: 5 (int) != 0 (n int)
64.91     commandconn_unix_test.go:58: assertion failed: error is not nil: write |1: broken pipe
64.91     commandconn_unix_test.go:69: test did not finish in time

The macOS one I think is also flaky, but test-results output isn't very useful;

signal: interrupt
FAIL    github.com/docker/cli/cli/command   0.181s