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

Requesting a collection: replace overview links #1529

Merged
merged 2 commits into from
May 28, 2024

Conversation

Andersson007
Copy link
Contributor

Implements https://forum.ansible.com/t/reduce-fragmentation-moving-stuff-to-the-forum-and-archiving-repos/5141/2?u=andersson007

IMPORTANT: this is still one occurrence in collection requirements but that will be removed in #1422

@Andersson007
Copy link
Contributor Author

ready for review

Copy link
Contributor

@oraNod oraNod left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks @Andersson007

@oraNod oraNod added backport-2.15 Automatically create a backport for the stable-2.15 branch backport-2.16 Automatically create a backport for the stable-2.16 branch backport-2.17 Automatically create a backport for the stable-2.17 branch labels May 28, 2024
@oraNod
Copy link
Contributor

oraNod commented May 28, 2024

@Andersson007 Just to be sure, should we backport this all the way to stable-2.15/stable-2.14 or just to stable-2.17?

@Andersson007
Copy link
Contributor Author

@oraNod let's try to backport it as far as we can up to 2.15. i'll do the failed manually if any

@oraNod oraNod merged commit fc4087a into ansible:devel May 28, 2024
8 checks passed
Copy link

patchback bot commented May 28, 2024

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

❌ Failed to cleanly apply fc4087a on top of patchback/backports/stable-2.15/fc4087a8bd8570abd744357ba0cb630f164f2b76/pr-1529

Backporting merged PR #1529 into devel

  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/ansible-documentation.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-2.15/fc4087a8bd8570abd744357ba0cb630f164f2b76/pr-1529 upstream/stable-2.15
  4. Now, cherry-pick PR Requesting a collection: replace overview links #1529 contents into that branch:
    $ git cherry-pick -x fc4087a8bd8570abd744357ba0cb630f164f2b76
    If it'll yell at you with something like fatal: Commit fc4087a8bd8570abd744357ba0cb630f164f2b76 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x fc4087a8bd8570abd744357ba0cb630f164f2b76
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Requesting a collection: replace overview links #1529 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-2.15/fc4087a8bd8570abd744357ba0cb630f164f2b76/pr-1529
  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.

Copy link

patchback bot commented May 28, 2024

Backport to stable-2.16: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-2.16/fc4087a8bd8570abd744357ba0cb630f164f2b76/pr-1529

Backported as #1535

🤖 @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 May 28, 2024
Requesting a collection: replace overview links

(cherry picked from commit fc4087a)
Copy link

patchback bot commented May 28, 2024

Backport to stable-2.17: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-2.17/fc4087a8bd8570abd744357ba0cb630f164f2b76/pr-1529

Backported as #1536

🤖 @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 May 28, 2024
Requesting a collection: replace overview links

(cherry picked from commit fc4087a)
oraNod added a commit that referenced this pull request May 28, 2024
…/fc4087a8bd8570abd744357ba0cb630f164f2b76/pr-1529

[PR #1529/fc4087a8 backport][stable-2.16] Requesting a collection: replace overview links
oraNod added a commit that referenced this pull request May 28, 2024
…/fc4087a8bd8570abd744357ba0cb630f164f2b76/pr-1529

[PR #1529/fc4087a8 backport][stable-2.17] Requesting a collection: replace overview links
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-2.15 Automatically create a backport for the stable-2.15 branch backport-2.16 Automatically create a backport for the stable-2.16 branch backport-2.17 Automatically create a backport for the stable-2.17 branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants