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

collection_requirements: update community topic links #1421

Merged
merged 3 commits into from May 20, 2024

Conversation

Andersson007
Copy link
Contributor

collection_requirements: update community topic links

@Andersson007 Andersson007 requested a review from a team as a code owner May 7, 2024 07:38
@ansible-documentation-bot ansible-documentation-bot bot added the sc_approval This PR requires approval from the Ansible Community Steering Committee label May 7, 2024
@samccann samccann 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 20, 2024
@samccann samccann merged commit b82d210 into ansible:devel May 20, 2024
8 checks passed
Copy link

patchback bot commented May 20, 2024

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

❌ Failed to cleanly apply b82d210 on top of patchback/backports/stable-2.15/b82d2109a9d12756d16eabe918ee893908914eb1/pr-1421

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

Backport to stable-2.16: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-2.16/b82d2109a9d12756d16eabe918ee893908914eb1/pr-1421

Backported as #1483

🤖 @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 20, 2024
* collection_requirements: update community topic links

* Add forum

* Update

(cherry picked from commit b82d210)
Copy link

patchback bot commented May 20, 2024

Backport to stable-2.17: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-2.17/b82d2109a9d12756d16eabe918ee893908914eb1/pr-1421

Backported as #1484

🤖 @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 20, 2024
* collection_requirements: update community topic links

* Add forum

* Update

(cherry picked from commit b82d210)
samccann pushed a commit that referenced this pull request May 20, 2024
* collection_requirements: update community topic links

* Add forum

* Update

(cherry picked from commit b82d210)

Co-authored-by: Andrew Klychkov <aaklychkov@mail.ru>
samccann pushed a commit that referenced this pull request May 20, 2024
* collection_requirements: update community topic links

* Add forum

* Update

(cherry picked from commit b82d210)

Co-authored-by: Andrew Klychkov <aaklychkov@mail.ru>
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 sc_approval This PR requires approval from the Ansible Community Steering Committee
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants