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 container deletion for remote repos #1045

Merged
merged 3 commits into from
Nov 5, 2021

Conversation

newswangerd
Copy link
Member

Issue: AAH-1095

@newswangerd newswangerd added the backport-4.3 This PR should be backported to stable-4.3 (2.0) label Nov 5, 2021
@newswangerd newswangerd merged commit a06a621 into ansible:master Nov 5, 2021
@patchback
Copy link

patchback bot commented Nov 5, 2021

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

❌ Failed to cleanly apply a06a621 on top of patchback/backports/stable-4.3/a06a621ff4835fe99f8578d269113f4009208e6b/pr-1045

Backporting merged PR #1045 into master

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

newswangerd added a commit to newswangerd/galaxy_ng that referenced this pull request Nov 5, 2021
* Fix container deletion for remote repos

Issue: AAH-1095

* Add reservation on remote.

* Fix flake8

(cherry picked from commit a06a621)
newswangerd added a commit that referenced this pull request Nov 5, 2021
* Fix container deletion for remote repos

Issue: AAH-1095

* Add reservation on remote.

* Fix flake8

(cherry picked from commit a06a621)
@github-actions github-actions bot added the backported-4.4 This PR has been backported to stable-4.4 (2.1) label Nov 5, 2021
jctanner pushed a commit to jctanner/galaxy_ng that referenced this pull request Dec 1, 2021
* Fix container deletion for remote repos

Issue: AAH-1095

* Add reservation on remote.

* Fix flake8
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-4.3 This PR should be backported to stable-4.3 (2.0) backported-4.4 This PR has been backported to stable-4.4 (2.1)
Projects
None yet
2 participants