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

Update main branch after community.aws 9.1.0 release #2260

Merged

Conversation

beeankha
Copy link
Contributor

@beeankha beeankha commented Mar 4, 2025

SUMMARY

Update main branch after community.aws 9.1.0 release

ISSUE TYPE
  • Docs Pull Request
COMPONENT NAME

Several

SUMMARY

Prep community.aws 9.1.0

ISSUE TYPE

Feature Pull Request

COMPONENT NAME
Multiple

Reviewed-by: Bianca Henderson <beeankha@gmail.com>
Reviewed-by: Bikouo Aubin
Reviewed-by: Alina Buzachis
Reviewed-by: Mike Graves <mgraves@redhat.com>
Reviewed-by: GomathiselviS <gomathiselvi@gmail.com>
(cherry picked from commit 440b786)
@beeankha beeankha requested a review from a team March 4, 2025 17:52
@beeankha beeankha self-assigned this Mar 4, 2025
Copy link

github-actions bot commented Mar 4, 2025

Docs Build 📝

Thank you for contribution!✨

This PR has been merged and your docs changes will be incorporated when they are next published.

Copy link
Contributor

Build succeeded.
https://ansible.softwarefactory-project.io/zuul/buildset/5c75ec892ff1497fb72ec561d8ac0a59

ansible-galaxy-importer FAILURE in 4m 19s (non-voting)
✔️ build-ansible-collection SUCCESS in 10m 32s

@beeankha beeankha added the mergeit Merge the PR (SoftwareFactory) label Mar 5, 2025
Copy link
Contributor

Build succeeded (gate pipeline).
https://ansible.softwarefactory-project.io/zuul/buildset/4bf504ce69f4449da2161dc27da8dba0

ansible-galaxy-importer FAILURE in 5m 07s (non-voting)
✔️ build-ansible-collection SUCCESS in 10m 45s

@softwarefactory-project-zuul softwarefactory-project-zuul bot merged commit 2715efb into ansible-collections:main Mar 5, 2025
84 of 87 checks passed
Copy link

patchback bot commented Mar 5, 2025

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

❌ Failed to cleanly apply 2715efb on top of patchback/backports/stable-9/2715efbb920249b1bb09ea604bf8922099436cde/pr-2260

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport_failed backport-9 mergeit Merge the PR (SoftwareFactory)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants