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

Avoid direct type comparisons #7085

Merged
merged 1 commit into from
Aug 11, 2023

Conversation

felixfontein
Copy link
Collaborator

SUMMARY

Fixes nightly CI failure.

ISSUE TYPE
  • Bugfix Pull Request
  • Test Pull Request
COMPONENT NAME

plugins/module_utils/oracle/oci_utils.py
plugins/modules/proxmox_user_info.py
tests/unit/mock/loader.py
tests/unit/plugins/modules/test_keycloak_user.py

@felixfontein felixfontein added check-before-release PR will be looked at again shortly before release and merged if possible. backport-6 labels Aug 11, 2023
@ansibullbot
Copy link
Collaborator

@ansibullbot ansibullbot added bug This issue/PR relates to a bug cloud module module module_utils module_utils plugins plugin (any type) tests tests unit tests/unit labels Aug 11, 2023
@felixfontein felixfontein merged commit a880940 into ansible-collections:main Aug 11, 2023
@patchback
Copy link

patchback bot commented Aug 11, 2023

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

❌ Failed to cleanly apply a880940 on top of patchback/backports/stable-6/a8809401ee61ad18ffee59c500b9b660511fb21e/pr-7085

Backporting merged PR #7085 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-6/a8809401ee61ad18ffee59c500b9b660511fb21e/pr-7085 upstream/stable-6
  4. Now, cherry-pick PR Avoid direct type comparisons #7085 contents into that branch:
    $ git cherry-pick -x a8809401ee61ad18ffee59c500b9b660511fb21e
    If it'll yell at you with something like fatal: Commit a8809401ee61ad18ffee59c500b9b660511fb21e is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x a8809401ee61ad18ffee59c500b9b660511fb21e
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Avoid direct type comparisons #7085 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-6/a8809401ee61ad18ffee59c500b9b660511fb21e/pr-7085
  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 sanity branch August 11, 2023 07:00
@felixfontein felixfontein removed the check-before-release PR will be looked at again shortly before release and merged if possible. label Aug 11, 2023
@patchback
Copy link

patchback bot commented Aug 11, 2023

Backport to stable-7: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-7/a8809401ee61ad18ffee59c500b9b660511fb21e/pr-7085

Backported as #7086

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

patchback bot pushed a commit that referenced this pull request Aug 11, 2023
Avoid direct type comparisons.

(cherry picked from commit a880940)
felixfontein added a commit that referenced this pull request Aug 11, 2023
…7086)

Avoid direct type comparisons (#7085)

Avoid direct type comparisons.

(cherry picked from commit a880940)

Co-authored-by: Felix Fontein <[email protected]>
felixfontein added a commit to felixfontein/community.general that referenced this pull request Aug 11, 2023
Avoid direct type comparisons.

(cherry picked from commit a880940)
felixfontein added a commit that referenced this pull request Aug 11, 2023
Avoid direct type comparisons (#7085)

Avoid direct type comparisons.

(cherry picked from commit a880940)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug This issue/PR relates to a bug cloud module_utils module_utils module module plugins plugin (any type) tests tests unit tests/unit
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants