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

Update community topics links #1451

Merged
merged 6 commits into from
May 16, 2024

Conversation

Andersson007
Copy link
Contributor

Update community topics links

Relates to a comment #1421 (comment)

@Andersson007 Andersson007 requested a review from a team as a code owner May 14, 2024 07:10
@ansible-documentation-bot ansible-documentation-bot bot added the sc_approval This PR requires approval from the Ansible Community Steering Committee label May 14, 2024
@Andersson007
Copy link
Contributor Author

ready for review

Co-authored-by: Don Naro <dnaro@redhat.com>
@mariolenz
Copy link
Contributor

What about Community Topics in maintainers_guidelines.rst?

Otherwise LGTM!

@Andersson007
Copy link
Contributor Author

What about Community Topics in maintainers_guidelines.rst?

Otherwise LGTM!

@mariolenz good catch, thanks! missed it somehow in the grep output, fixed, PTAL

Copy link
Contributor

@mariolenz mariolenz left a comment

Choose a reason for hiding this comment

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

LGTM

@Andersson007 Andersson007 merged commit 83b7c12 into ansible:devel May 16, 2024
8 checks passed
@Andersson007
Copy link
Contributor Author

@oraNod @mariolenz thanks for reviewing!

@Andersson007 Andersson007 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 16, 2024
Copy link

patchback bot commented May 16, 2024

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

❌ Failed to cleanly apply 83b7c12 on top of patchback/backports/stable-2.15/83b7c122ed48ae2844eea867650b7d880ef026ab/pr-1451

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

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

❌ Failed to cleanly apply 83b7c12 on top of patchback/backports/stable-2.16/83b7c122ed48ae2844eea867650b7d880ef026ab/pr-1451

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

Backport to stable-2.17: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-2.17/83b7c122ed48ae2844eea867650b7d880ef026ab/pr-1451

Backported as #1462

🤖 @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 16, 2024
* Update community topics links

* fix

* fix

* fix

* Update docs/docsite/rst/community/contributor_path.rst

Co-authored-by: Don Naro <dnaro@redhat.com>

* Fix

---------

Co-authored-by: Don Naro <dnaro@redhat.com>
(cherry picked from commit 83b7c12)
@Andersson007
Copy link
Contributor Author

@samccann which version do we need to backport it to besides 2.17?

samccann pushed a commit that referenced this pull request May 16, 2024
* Update community topics links

* fix

* fix

* fix

* Update docs/docsite/rst/community/contributor_path.rst

Co-authored-by: Don Naro <dnaro@redhat.com>

* Fix

---------

Co-authored-by: Don Naro <dnaro@redhat.com>
(cherry picked from commit 83b7c12)

Co-authored-by: Andrew Klychkov <aaklychkov@mail.ru>
@samccann samccann added backport-2.16 Automatically create a backport for the stable-2.16 branch and removed 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 labels May 16, 2024
Copy link

patchback bot commented May 16, 2024

Backport to stable-2.16: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-2.16/83b7c122ed48ae2844eea867650b7d880ef026ab/pr-1451

Backported as #1469

🤖 @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 16, 2024
* Update community topics links

* fix

* fix

* fix

* Update docs/docsite/rst/community/contributor_path.rst

Co-authored-by: Don Naro <dnaro@redhat.com>

* Fix

---------

Co-authored-by: Don Naro <dnaro@redhat.com>
(cherry picked from commit 83b7c12)
samccann pushed a commit that referenced this pull request May 16, 2024
* Update community topics links

* fix

* fix

* fix

* Update docs/docsite/rst/community/contributor_path.rst

Co-authored-by: Don Naro <dnaro@redhat.com>

* Fix

---------

Co-authored-by: Don Naro <dnaro@redhat.com>
(cherry picked from commit 83b7c12)

Co-authored-by: Andrew Klychkov <aaklychkov@mail.ru>
@samccann
Copy link
Contributor

I got this to backport to 2.16 which we should technically still do as that is latest. 2.15 is a stretch goal and even after banging away at local cherry-picks I hit multiple other bits of content that didn't backport to 2.15 so... I gave up.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

4 participants