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

chore(docs): rpm_ostree_pkg fix examples #9436

Merged
merged 1 commit into from
Dec 28, 2024
Merged

chore(docs): rpm_ostree_pkg fix examples #9436

merged 1 commit into from
Dec 28, 2024

Conversation

sergeiwaigant
Copy link
Contributor

@sergeiwaigant sergeiwaigant commented Dec 28, 2024 •
edited
Loading

SUMMARY

Fixing the module name for one example in rpm_ostree_pkg

ISSUE TYPE
  • Docs Pull Request
COMPONENT NAME

rpm_ostree_pkg

ADDITIONAL INFORMATION

N/A

@ansibullbot
Copy link
Collaborator

cc @Akasurde @dustymabe
click here for bot help

@ansibullbot ansibullbot added WIP Work in progress bug This issue/PR relates to a bug docs_only module module new_contributor Help guide this first time contributor plugins plugin (any type) small_patch Hopefully easy to review labels Dec 28, 2024
@sergeiwaigant sergeiwaigant marked this pull request as ready for review December 28, 2024 09:30
@ansibullbot ansibullbot added docs and removed WIP Work in progress labels Dec 28, 2024
felixfontein
felixfontein approved these changes Dec 28, 2024
View reviewed changes
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 fixing this!

@felixfontein felixfontein added backport-8 Automatically create a backport for the stable-8 branch backport-9 Automatically create a backport for the stable-9 branch backport-10 Automatically create a backport for the stable-10 branch labels Dec 28, 2024
@felixfontein felixfontein merged commit 4b4e4b7 into ansible-collections:main Dec 28, 2024
129 checks passed
@patchback Patchback
Copy link

patchback bot commented Dec 28, 2024 •
edited
Loading

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

❌ Failed to cleanly apply 4b4e4b7 on top of patchback/backports/stable-8/4b4e4b7e0a5f7db8c5c99da7ba080fb7ec410ed1/pr-9436

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

@patchback Patchback
Copy link

patchback bot commented Dec 28, 2024 •
edited
Loading

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

❌ Failed to cleanly apply 4b4e4b7 on top of patchback/backports/stable-9/4b4e4b7e0a5f7db8c5c99da7ba080fb7ec410ed1/pr-9436

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

@sergeiwaigant thanks for your contribution!

@patchback Patchback
Copy link

patchback bot commented Dec 28, 2024 •
edited
Loading

Backport to stable-10: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-10/4b4e4b7e0a5f7db8c5c99da7ba080fb7ec410ed1/pr-9436

Backported as #9441

🤖 @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 Dec 28, 2024
@sergeiwaigant @patchback
chore(docs): rpm_ostree_pkg fix examples (#9436)
d096853 
(cherry picked from commit 4b4e4b7)
@patchback patchback bot mentioned this pull request Dec 28, 2024
Merged
felixfontein pushed a commit that referenced this pull request Dec 28, 2024
@patchback @sergeiwaigant
[PR #9436/4b4e4b7e backport][stable-10] chore(docs): rpm_ostree_pkg f…
becda86 
…ix examples (#9441)

chore(docs): rpm_ostree_pkg fix examples (#9436)

(cherry picked from commit 4b4e4b7)

Co-authored-by: Sergei Waigant <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@felixfontein felixfontein felixfontein approved these changes

Assignees
No one assigned
Labels
backport-8 Automatically create a backport for the stable-8 branch backport-9 Automatically create a backport for the stable-9 branch backport-10 Automatically create a backport for the stable-10 branch bug This issue/PR relates to a bug docs_only docs module module new_contributor Help guide this first time contributor plugins plugin (any type) small_patch Hopefully easy to review
Projects
None yet
Milestone
No milestone
Development

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