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

collection requirements/steering committee inclusion policy: change #995

Merged
merged 4 commits into from Jan 16, 2024

Conversation

@Andersson007 Andersson007 requested a review from a team as a code owner January 2, 2024 08:46
@Andersson007 Andersson007 marked this pull request as draft January 2, 2024 08:46
@ansible-documentation-bot ansible-documentation-bot bot added the sc_approval This PR requires approval from the Ansible Community Steering Committee label Jan 2, 2024
…requirements.rst

Co-authored-by: Felix Fontein <felix@fontein.de>
…ee.rst

Co-authored-by: Felix Fontein <felix@fontein.de>
@Andersson007
Copy link
Contributor Author

Should we vote on this PR or we can merge after someone else from SC approves the PR, ideas?

@samccann
Copy link
Contributor

samccann commented Jan 3, 2024

my non-voting opinion is this needs a formal vote.

@Andersson007
Copy link
Contributor Author

my non-voting opinion is this needs a formal vote.

yeah, we discussed it a bit yesterday, will open the vote on Monday, was going but forgot to update the comment:)

Copy link
Contributor

@gundalow gundalow left a comment

Choose a reason for hiding this comment

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

I approve as we have In case of rejection/removal, the collection maintainers receive comprehensive feedback from the Committee explaining the reasons of the decision.

Key thing I want to see is that we give clear feedback early to the Collection Maintainer, and continue to help them. We've done a good job at this so far.

@Andersson007

This comment was marked as resolved.

@felixfontein felixfontein marked this pull request as ready for review January 16, 2024 20:27
@felixfontein
Copy link
Collaborator

This has been approved in https://forum.ansible.com/t/vote-ended-sc-vote-on-inclusion-policy-changes/3194/4.

@felixfontein felixfontein changed the title [Needs SC vote before merging] collection requirements/steering committee inclusion policy: change collection requirements/steering committee inclusion policy: change Jan 16, 2024
@felixfontein felixfontein merged commit d9e034c into ansible:devel Jan 16, 2024
8 checks passed
@felixfontein felixfontein added the backport-2.16 Automatically create a backport for the stable-2.16 branch label Jan 16, 2024
Copy link

patchback bot commented Jan 16, 2024

Backport to stable-2.16: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-2.16/d9e034c86253cfd97550405ce6ca9bfba0d15729/pr-995

Backported as #1047

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

patchback bot pushed a commit that referenced this pull request Jan 16, 2024
…995)

* collection requirements/steering committee inclusion policy: change

* Update docs/docsite/rst/community/collection_contributors/collection_requirements.rst

Co-authored-by: Felix Fontein <felix@fontein.de>

* Update docs/docsite/rst/community/steering/community_steering_committee.rst

Co-authored-by: Felix Fontein <felix@fontein.de>

* Incorporate feedback

---------

Co-authored-by: Felix Fontein <felix@fontein.de>
(cherry picked from commit d9e034c)
@felixfontein felixfontein added the backport-2.15 Automatically create a backport for the stable-2.15 branch label Jan 16, 2024
Copy link

patchback bot commented Jan 16, 2024

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

❌ Failed to cleanly apply d9e034c on top of patchback/backports/stable-2.15/d9e034c86253cfd97550405ce6ca9bfba0d15729/pr-995

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

felixfontein pushed a commit that referenced this pull request Jan 16, 2024
…995) (#1047)

* collection requirements/steering committee inclusion policy: change

* Update docs/docsite/rst/community/collection_contributors/collection_requirements.rst

Co-authored-by: Felix Fontein <felix@fontein.de>

* Update docs/docsite/rst/community/steering/community_steering_committee.rst

Co-authored-by: Felix Fontein <felix@fontein.de>

* Incorporate feedback

---------

Co-authored-by: Felix Fontein <felix@fontein.de>
(cherry picked from commit d9e034c)

Co-authored-by: Andrew Klychkov <aaklychkov@mail.ru>
@Andersson007
Copy link
Contributor Author

Thanks everyone!

oraNod pushed a commit to BhattacharjeeSutapa/ansible-documentation that referenced this pull request Feb 12, 2024
…nsible#995)

* collection requirements/steering committee inclusion policy: change

* Update docs/docsite/rst/community/collection_contributors/collection_requirements.rst

Co-authored-by: Felix Fontein <felix@fontein.de>

* Update docs/docsite/rst/community/steering/community_steering_committee.rst

Co-authored-by: Felix Fontein <felix@fontein.de>

* Incorporate feedback

---------

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.

None yet

4 participants