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

Fix syntax issue before a code block. #284

Merged
merged 1 commit into from
Aug 12, 2023

Conversation

CyrilBrulebois
Copy link
Contributor

I still haven't set up a full build chain to make sure the end results look good but I'm pretty confident. Also, it can't really be worse than the current situation.

@github-actions github-actions bot added the needs_triage Needs a first human triage before being processed. label Aug 12, 2023
@felixfontein
Copy link
Collaborator

I guess someone forgot to remove the : when the code block below was converted to a .. code-block. Thanks for fixing this!

@felixfontein felixfontein added backport-2.15 Automatically create a backport for the stable-2.15 branch backport-2.14 Automatically create a backport for the stable-2.14 branch backport-2.13 Automatically create a backport for the stable-2.13 branch labels Aug 12, 2023
@felixfontein felixfontein merged commit 8b9a682 into ansible:devel Aug 12, 2023
@patchback
Copy link

patchback bot commented Aug 12, 2023

Backport to stable-2.15: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-2.15/8b9a6824c3e1894c45ea1421301095a4a64f7968/pr-284

Backported as #286

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

@patchback
Copy link

patchback bot commented Aug 12, 2023

Backport to stable-2.14: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-2.14/8b9a6824c3e1894c45ea1421301095a4a64f7968/pr-284

Backported as #287

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

@patchback
Copy link

patchback bot commented Aug 12, 2023

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

❌ Failed to cleanly apply 8b9a682 on top of patchback/backports/stable-2.13/8b9a6824c3e1894c45ea1421301095a4a64f7968/pr-284

Backporting merged PR #284 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.13/8b9a6824c3e1894c45ea1421301095a4a64f7968/pr-284 upstream/stable-2.13
  4. Now, cherry-pick PR Fix syntax issue before a code block. #284 contents into that branch:
    $ git cherry-pick -x 8b9a6824c3e1894c45ea1421301095a4a64f7968
    If it'll yell at you with something like fatal: Commit 8b9a6824c3e1894c45ea1421301095a4a64f7968 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 8b9a6824c3e1894c45ea1421301095a4a64f7968
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Fix syntax issue before a code block. #284 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-2.13/8b9a6824c3e1894c45ea1421301095a4a64f7968/pr-284
  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 pushed a commit that referenced this pull request Aug 12, 2023
(cherry picked from commit 8b9a682)

Co-authored-by: Cyril Brulebois <[email protected]>
felixfontein pushed a commit that referenced this pull request Aug 12, 2023
(cherry picked from commit 8b9a682)

Co-authored-by: Cyril Brulebois <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-2.13 Automatically create a backport for the stable-2.13 branch backport-2.14 Automatically create a backport for the stable-2.14 branch backport-2.15 Automatically create a backport for the stable-2.15 branch needs_triage Needs a first human triage before being processed.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants