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

ci: refresh dev dependencies #1707

Merged
merged 2 commits into from
Jul 24, 2024

ci: refresh dev dependencies

11de222
Select commit
Loading
Failed to load commit list.
Merged

ci: refresh dev dependencies #1707

ci: refresh dev dependencies
11de222
Select commit
Loading
Failed to load commit list.
Patchback / Backport to stable-2.14 completed Jul 24, 2024 in 17s

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

❌ Failed to cleanly apply 141ca11 on top of patchback/backports/stable-2.14/141ca118dc7fbe17cccc4c9ba0c42645028c6766/pr-1707

Details

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