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

style: convert yes/no to true/false #337

Merged
merged 5 commits into from
Aug 29, 2022
Merged

style: convert yes/no to true/false #337

merged 5 commits into from
Aug 29, 2022

Conversation

hunleyd
Copy link
Collaborator

@hunleyd hunleyd commented Aug 27, 2022

Convert yes/no to true/false respectively across the collection

fixed #334

Signed-off-by: Douglas J Hunley <[email protected]>
* 'main' of github.com:hunleyd/community.postgresql:
  test: add f35 to docker 2.13 as per @felixfontein
  test: remove f35 from azure pipeline
@hunleyd hunleyd self-assigned this Aug 27, 2022
Signed-off-by: Douglas J Hunley <[email protected]>
@hunleyd
Copy link
Collaborator Author

hunleyd commented Aug 28, 2022

does this look sane @Andersson007 ?

Copy link
Collaborator

@Andersson007 Andersson007 left a comment

Choose a reason for hiding this comment

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

@hunleyd thanks for the great work! Feel free to merge and backport

@hunleyd hunleyd merged commit a08ee81 into ansible-collections:main Aug 29, 2022
@patchback
Copy link

patchback bot commented Aug 29, 2022

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

❌ Failed to cleanly apply a08ee81 on top of patchback/backports/stable-1/a08ee81dea6dfd150dd92ea45b950d007d6b98b5/pr-337

Backporting merged PR #337 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.postgresql.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-1/a08ee81dea6dfd150dd92ea45b950d007d6b98b5/pr-337 upstream/stable-1
  4. Now, cherry-pick PR style: convert yes/no to true/false #337 contents into that branch:
    $ git cherry-pick -x a08ee81dea6dfd150dd92ea45b950d007d6b98b5
    If it'll yell at you with something like fatal: Commit a08ee81dea6dfd150dd92ea45b950d007d6b98b5 is a merge but no -m option was given., add -m 1 as follows intead:
    $ git cherry-pick -m1 -x a08ee81dea6dfd150dd92ea45b950d007d6b98b5
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR style: convert yes/no to true/false #337 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-1/a08ee81dea6dfd150dd92ea45b950d007d6b98b5/pr-337
  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.

@Andersson007
Copy link
Collaborator

@hunleyd ah, manual backport is needed, if there's any difficulty with it, please let me know

@hunleyd hunleyd mentioned this pull request Aug 29, 2022
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.

do not use yes/no in doc
2 participants