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

lint and fix polkit examples #8381

Merged
merged 3 commits into from
May 19, 2024

Conversation

konstruktoid
Copy link
Contributor

SUMMARY

This PR:

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

machinectl
run0

Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
@ansibullbot
Copy link
Collaborator

cc @None
click here for bot help

@ansibullbot ansibullbot added become become plugin bug This issue/PR relates to a bug plugins plugin (any type) labels May 17, 2024
@konstruktoid
Copy link
Contributor Author

!component +plugins/become/machinectl
!component +plugins/become/run0

@felixfontein felixfontein added check-before-release PR will be looked at again shortly before release and merged if possible. backport-7 Automatically create a backport for the stable-7 branch backport-8 Automatically create a backport for the stable-8 branch labels May 18, 2024
Copy link
Collaborator

@felixfontein felixfontein left a comment

Choose a reason for hiding this comment

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

Thanks for your contribution!

changelogs/fragments/polkit-become.yml Outdated Show resolved Hide resolved
@felixfontein felixfontein removed the backport-7 Automatically create a backport for the stable-7 branch label May 18, 2024
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
@konstruktoid
Copy link
Contributor Author

Done!

Copy link
Collaborator

@felixfontein felixfontein left a comment

Choose a reason for hiding this comment

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

Looks good to me! I'll merge this tomorrow if nobody objects.

@felixfontein felixfontein removed the check-before-release PR will be looked at again shortly before release and merged if possible. label May 19, 2024
@felixfontein felixfontein merged commit f82e7a7 into ansible-collections:main May 19, 2024
132 checks passed
Copy link

patchback bot commented May 19, 2024

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

❌ Failed to cleanly apply f82e7a7 on top of patchback/backports/stable-8/f82e7a7b83099f2f1fda9a4dfb81586732577bbd/pr-8381

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

@konstruktoid thanks for your contribution!

austinlucaslake pushed a commit to austinlucaslake/community.general that referenced this pull request May 25, 2024
* lint and fix polkit examples

Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>

* add changelog fragment

Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>

* remove changelog fragment

Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>

---------

Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-8 Automatically create a backport for the stable-8 branch become become plugin bug This issue/PR relates to a bug docs_only plugins plugin (any type)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants