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

Unflatmap community.network #482

Merged
merged 8 commits into from Nov 4, 2022

Conversation

felixfontein
Copy link
Collaborator

SUMMARY

See ansible-community/community-topics#147. At today's community meeting we (who were present) informally agreed to make community.general and community.network flat (however you want to call it).

ISSUE TYPE
  • Bugfix Pull Request
  • Feature Pull Request
COMPONENT NAME

collection

@felixfontein felixfontein added the breaking_change This PR contains a breaking change that MUST NOT be backported label Nov 2, 2022
@felixfontein
Copy link
Collaborator Author

bot_skip

@felixfontein
Copy link
Collaborator Author

@Ompragash @Andersson007 it's basically up to you how you want to proceed with this. For community.general, I will merge the corresponding PR (ansible-collections/community.general#5461) as soon as CI passes (and there are no comments) and release a 6.0.0a1 version with it, and if there's no bad surprise the plan is to include it in next Monday's community.general 6.0.0 release.

@felixfontein
Copy link
Collaborator Author

Note that merging this will introduce conflicts to probably all other PRs. If you merge this, here are some messages you can write into these PRs (I added similar messages depending on the situation to all community.general PRs that modified/added modules):

Please note that in #482 the collection repository was restructured to remove the directory tree in plugins/modules/, and the corresponding tree in tests/unit/plugins/modules/. Your PR modifies files in this directory structure, but it seems that GitHub can still manage the renames. If you suddenly notice that there are strange conflicts, these could come from that change and rebasing with the current main branch should fix them.

Please note that in #482 the collection repository was restructured to remove the directory tree in plugins/modules/, and the corresponding tree in tests/unit/plugins/modules/. Your PR modifies files in this directory structure, and unfortunately now has some conflicts, potentially because of this. Please rebase with the current main branch to remove the conflicts.

Please note that in #482 the collection repository was restructured to remove the directory tree in plugins/modules/, and the corresponding tree in tests/unit/plugins/modules/. Your PR adds new files into this hierarchy. Please rebase with the current main branch and move your files directly into plugins/modules/. You also can remove the changes to meta/runtime.yml, these are not needed anymore, and make sure to adjust the new entries in .github/BOTMETA.yml as well.

@Andersson007
Copy link
Contributor

Andersson007 commented Nov 4, 2022

@felixfontein thanks for working on this!

So what should we do to be in time:

UPDATE: instead ^, we can just follow https://docs.ansible.com/ansible/devel/community/collection_contributors/collection_release_with_branches.html#releasing-major-collection-versions

@Andersson007 Andersson007 merged commit 37234a0 into ansible-collections:main Nov 4, 2022
@felixfontein felixfontein deleted the unflatmap branch November 4, 2022 10:49
@felixfontein
Copy link
Collaborator Author

@Andersson007 thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
breaking_change This PR contains a breaking change that MUST NOT be backported
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants