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

remove extraneous doc fragments #9433

Conversation

russoz
Copy link
Collaborator

@russoz russoz commented Dec 27, 2024

SUMMARY
ISSUE TYPE
  • Docs Pull Request
COMPONENT NAME

plugins/doc_fragments/emc.py
plugins/doc_fragments/purestorage.py
plugins/doc_fragments/vexata.py

@ansibullbot ansibullbot added docs docs_fragments docs_fragments plugin (shared docs) plugins plugin (any type) labels Dec 27, 2024
@felixfontein felixfontein added check-before-release PR will be looked at again shortly before release and merged if possible. backport-10 Automatically create a backport for the stable-10 branch labels Dec 27, 2024
@felixfontein
Copy link
Collaborator

These fragments weren't usable since in them, options was a list. This was fixed in #9422 and #9423, so it didn't work in the previous release.

@felixfontein felixfontein merged commit 6748ec3 into ansible-collections:main Dec 27, 2024
129 checks passed
Copy link

patchback bot commented Dec 27, 2024

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

❌ Failed to cleanly apply 6748ec3 on top of patchback/backports/stable-10/6748ec399334fd36e9b095b0cc1c74deb62a42eb/pr-9433

Backporting merged PR #9433 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-10/6748ec399334fd36e9b095b0cc1c74deb62a42eb/pr-9433 upstream/stable-10
  4. Now, cherry-pick PR remove extraneous doc fragments #9433 contents into that branch:
    $ git cherry-pick -x 6748ec399334fd36e9b095b0cc1c74deb62a42eb
    If it'll yell at you with something like fatal: Commit 6748ec399334fd36e9b095b0cc1c74deb62a42eb is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 6748ec399334fd36e9b095b0cc1c74deb62a42eb
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR remove extraneous doc fragments #9433 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-10/6748ec399334fd36e9b095b0cc1c74deb62a42eb/pr-9433
  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 removed the check-before-release PR will be looked at again shortly before release and merged if possible. label Dec 27, 2024
@russoz russoz deleted the remove-extraneous-docfrags branch December 27, 2024 23:03
@felixfontein felixfontein added backport-10 Automatically create a backport for the stable-10 branch and removed backport-10 Automatically create a backport for the stable-10 branch labels Dec 27, 2024
Copy link

patchback bot commented Dec 27, 2024

Backport to stable-10: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-10/6748ec399334fd36e9b095b0cc1c74deb62a42eb/pr-9433

Backported as #9434

🤖 @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 27, 2024
felixfontein pushed a commit that referenced this pull request Dec 27, 2024
…ts (#9434)

remove extraneous doc fragments (#9433)

(cherry picked from commit 6748ec3)

Co-authored-by: Alexei Znamensky <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-10 Automatically create a backport for the stable-10 branch docs_fragments docs_fragments plugin (shared docs) docs plugins plugin (any type)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants