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.

Sign up for GitHub

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

Jump to bottom

More true/false normalization #6152

Merged
merged 4 commits into from
Mar 6, 2023
Merged

More true/false normalization #6152

merged 4 commits into from
Mar 6, 2023

Conversation

felixfontein
Copy link
Collaborator

SUMMARY

More boolean normalization done with ansible-community/community-team#60 (comment).

ISSUE TYPE
  • Docs Pull Request
COMPONENT NAME

various

@ansibullbot

This comment was marked as off-topic.

Sign in to view
@github-actions
Copy link

github-actions bot commented Mar 6, 2023 •
edited
Loading

Docs Build 📝

Thank you for contribution!✨

This PR has been merged and your docs changes will be incorporated when they are next published.

kristianheljas
kristianheljas suggested changes Mar 6, 2023
View reviewed changes
@ansibullbot ansibullbot added the needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR label Mar 6, 2023
kristianheljas
kristianheljas approved these changes Mar 6, 2023
View reviewed changes
Copy link
Contributor

@kristianheljas kristianheljas left a comment

Choose a reason for hiding this comment

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

LGTM!

@ansibullbot ansibullbot removed the needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR label Mar 6, 2023
@felixfontein felixfontein merged commit 11c7611 into ansible-collections:main Mar 6, 2023
@patchback
Copy link

patchback bot commented Mar 6, 2023 •
edited
Loading

Backport to stable-5: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 11c7611 on top of patchback/backports/stable-5/11c7611ced8f9398a0fbd76a3bb93dc35f0cb909/pr-6152

Backporting merged PR #6152 into main

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it: 
    $ git remote add upstream https://github.com/ansible-collections/community.general.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code: 
    $ git fetch upstream
$ git checkout -b patchback/backports/stable-5/11c7611ced8f9398a0fbd76a3bb93dc35f0cb909/pr-6152 upstream/stable-5
  4. Now, cherry-pick PR More true/false normalization #6152 contents into that branch: 
    $ git cherry-pick -x 11c7611ced8f9398a0fbd76a3bb93dc35f0cb909
    If it'll yell at you with something like fatal: Commit 11c7611ced8f9398a0fbd76a3bb93dc35f0cb909 is a merge but no -m option was given., add -m 1 as follows instead: 
    $ git cherry-pick -m1 -x 11c7611ced8f9398a0fbd76a3bb93dc35f0cb909
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR More true/false normalization #6152 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub: 
    $ git push origin patchback/backports/stable-5/11c7611ced8f9398a0fbd76a3bb93dc35f0cb909/pr-6152
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@felixfontein felixfontein deleted the bool branch March 6, 2023 22:02
@patchback
Copy link

patchback bot commented Mar 6, 2023 •
edited
Loading

Backport to stable-6: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-6/11c7611ced8f9398a0fbd76a3bb93dc35f0cb909/pr-6152

Backported as #6153

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@felixfontein
Copy link
Collaborator Author

@kristianheljas thanks for reviewing this!

patchback bot pushed a commit that referenced this pull request Mar 6, 2023
@felixfontein @patchback
More true/false normalization (#6152)
d94cd7f 
* More true/false normalization.

* Boolean do not need explicit choices.

* One more.

* Fix type argument.

(cherry picked from commit 11c7611)
@patchback patchback bot mentioned this pull request Mar 6, 2023
Merged
felixfontein added a commit that referenced this pull request Mar 7, 2023
@patchback @felixfontein
[PR #6152/11c7611c backport][stable-6] More true/false normalization (#…
47514e1 
…6153)

More true/false normalization (#6152)

* More true/false normalization.

* Boolean do not need explicit choices.

* One more.

* Fix type argument.

(cherry picked from commit 11c7611)

Co-authored-by: Felix Fontein <felix@fontein.de>
@felixfontein felixfontein mentioned this pull request Mar 7, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kristianheljas kristianheljas kristianheljas approved these changes

Assignees
No one assigned
Labels
docs integration tests/integration module module net_tools plugins plugin (any type) remote_management storage system tests tests web_infrastructure
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@felixfontein @ansibullbot @kristianheljas