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

Remove Ansible 2.9 & 2.10 #245

Merged
merged 4 commits into from
Apr 26, 2022
Merged

Remove Ansible 2.9 & 2.10 #245

merged 4 commits into from
Apr 26, 2022

Conversation

jchancojr
Copy link
Collaborator

SUMMARY

Remove Ansible 2.9 & 2.10

@jchancojr jchancojr self-assigned this Apr 26, 2022
@hunleyd hunleyd linked an issue Apr 26, 2022 that may be closed by this pull request
6 tasks
Copy link
Collaborator

@hunleyd hunleyd left a comment

Choose a reason for hiding this comment

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

lgtm, thanks @jchancojr !

Copy link
Collaborator

@Andersson007 Andersson007 left a comment

Choose a reason for hiding this comment

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

@jchancojr thanks! Couple of suggestions from me.

README.md Outdated Show resolved Hide resolved
changelogs/fragments/remove-2.9-2.10-compatability.yml Outdated Show resolved Hide resolved
@jchancojr
Copy link
Collaborator Author

Thanks, @Andersson007! Will review and do the needful.

@hunleyd hunleyd merged commit 6f0d58d into ansible-collections:main Apr 26, 2022
@patchback
Copy link

patchback bot commented Apr 26, 2022

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

❌ Failed to cleanly apply 6f0d58d on top of patchback/backports/stable-1/6f0d58d6715ed3ed204ab50bd0f23d726b537de9/pr-245

Backporting merged PR #245 into main

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

@Andersson007
Copy link
Collaborator

@jchancojr seems that there are conflicts, would you like to try to backport your PR to stable-1 manually?
alternatively you could use https://docs.ansible.com/ansible/devel/community/development_process.html#backporting-merged-prs-in-ansible-base (use main instead of devel).
if you have no time, please let me know

@jchancojr
Copy link
Collaborator Author

Hi, @Andersson007

I'll get the backport to stable-1 done manually. No problem

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Drop support of Ansible 2.9 and ansible-base 2.10
3 participants