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

Change Getting started EE guide reference to point to the relevant location #1877

Merged
merged 1 commit into from
Sep 12, 2024

Conversation

Andersson007
Copy link
Contributor

Change Getting started EE guide reference to point to the relevant location

@Andersson007 Andersson007 requested a review from a team as a code owner September 12, 2024 10:36
@ansible-documentation-bot ansible-documentation-bot bot added the sc_approval This PR requires approval from the Ansible Community Steering Committee label Sep 12, 2024
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.

Thanks @Andersson007

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.

Approving SC related part.

@Andersson007 Andersson007 merged commit 9f3e3f4 into ansible:devel Sep 12, 2024
9 checks passed
@Andersson007
Copy link
Contributor Author

@oraNod @felixfontein 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 Sep 12, 2024
Copy link

patchback bot commented Sep 12, 2024

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

❌ Failed to cleanly apply 9f3e3f4 on top of patchback/backports/stable-2.15/9f3e3f4b7c3b9335f5488bb6150c7397ba18e039/pr-1877

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

Backport to stable-2.16: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-2.16/9f3e3f4b7c3b9335f5488bb6150c7397ba18e039/pr-1877

Backported as #1879

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

Copy link

patchback bot commented Sep 12, 2024

Backport to stable-2.17: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-2.17/9f3e3f4b7c3b9335f5488bb6150c7397ba18e039/pr-1877

Backported as #1880

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@Andersson007
Copy link
Contributor Author

Ah, as @oraNod pointed out in another PR, the guides simply don't exist in stable-2.15, so no need to backport to it

oraNod pushed a commit that referenced this pull request Sep 12, 2024
…cation (#1877) (#1880)

(cherry picked from commit 9f3e3f4)

Co-authored-by: Andrew Klychkov <[email protected]>
oraNod pushed a commit that referenced this pull request Sep 12, 2024
…cation (#1877) (#1879)

(cherry picked from commit 9f3e3f4)

Co-authored-by: Andrew Klychkov <[email protected]>
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.

3 participants