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

Ansible 9 roadmap: only do alphas after planned prereleases of ansible-core #404

Merged
merged 1 commit into from
Sep 27, 2023

Conversation

felixfontein
Copy link
Collaborator

We can still do more releases if necessary.

We can still do more releases if necessary.
@felixfontein felixfontein requested a review from a team as a code owner September 20, 2023 18:18
@github-actions github-actions bot added sc_approval This PR requires approval from the Ansible Community Steering Committee needs_triage Needs a first human triage before being processed. labels Sep 20, 2023
@oraNod oraNod removed the needs_triage Needs a first human triage before being processed. label Sep 21, 2023
@felixfontein felixfontein changed the title [WIP] Ansible 9 roadmap: only do alphas after planned prereleases of ansible-core Ansible 9 roadmap: only do alphas after planned prereleases of ansible-core Sep 27, 2023
@felixfontein
Copy link
Collaborator Author

This has been approved in ansible-community/community-topics#275 (comment).

@felixfontein felixfontein merged commit e85232b into ansible:devel Sep 27, 2023
6 checks passed
@felixfontein felixfontein added backport-2.15 Automatically create a backport for the stable-2.15 branch backport-2.16 Automatically create a backport for the stable-2.16 branch labels Sep 27, 2023
@patchback
Copy link

patchback bot commented Sep 27, 2023

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

❌ Failed to cleanly apply e85232b on top of patchback/backports/stable-2.15/e85232bfefea28bfeb9b9ee8acac3a356ee79875/pr-404

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

@patchback
Copy link

patchback bot commented Sep 27, 2023

Backport to stable-2.16: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-2.16/e85232bfefea28bfeb9b9ee8acac3a356ee79875/pr-404

Backported as #440

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

@felixfontein felixfontein deleted the roadmap branch September 27, 2023 11:06
@felixfontein
Copy link
Collaborator Author

Thanks everyone!

patchback bot pushed a commit that referenced this pull request Sep 27, 2023
We can still do more releases if necessary.

(cherry picked from commit e85232b)
felixfontein added a commit that referenced this pull request Sep 27, 2023
We can still do more releases if necessary.

(cherry picked from commit e85232b)

Co-authored-by: Felix Fontein <felix@fontein.de>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-2.15 Automatically create a backport for the stable-2.15 branch backport-2.16 Automatically create a backport for the stable-2.16 branch sc_approval This PR requires approval from the Ansible Community Steering Committee
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants