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.

Sign up for GitHub

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

Jump to bottom

Apk: add support for a custom world file #4976

Merged
merged 2 commits into from
Jul 26, 2022
Merged

Apk: add support for a custom world file #4976

merged 2 commits into from
Jul 26, 2022

Conversation

CactiChameleon9
Copy link
Contributor

SUMMARY

This adds a new world parameter to the apk packaging module. This helps remove the hardcoded /etc/apk/world and therefore allows usage on more complex/non-standard linux systems with the apk package manager.

ISSUE TYPE
  • Feature Pull Request
COMPONENT NAME

Apk custom world parameter

ADDITIONAL INFORMATION

N/A

@ansibullbot
Copy link
Collaborator

cc @tdtrask
click here for bot help

@ansibullbot ansibullbot added feature This issue/PR relates to a feature request module module new_contributor Help guide this first time contributor os packaging plugins plugin (any type) labels Jul 23, 2022
@ansibullbot

This comment was marked as outdated.

Sign in to view
@ansibullbot ansibullbot added the needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR label Jul 23, 2022
felixfontein
felixfontein reviewed Jul 23, 2022
View reviewed changes
Copy link
Collaborator

@felixfontein felixfontein left a comment

Choose a reason for hiding this comment

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

Thanks for your contribution! Could you please add a changelog fragment? Thanks.

Regarding the errors in CI: it seems you have an indentation problem with elements in the world: dictionary.

plugins/modules/packaging/os/apk.py Outdated Show resolved Hide resolved
plugins/modules/packaging/os/apk.py Outdated Show resolved Hide resolved
@felixfontein felixfontein added check-before-release PR will be looked at again shortly before release and merged if possible. backport-5 labels Jul 23, 2022
@github-actions
Copy link

github-actions bot commented Jul 23, 2022 •
edited
Loading

Docs Build 📝

Thank you for contribution!✨

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

@ansibullbot ansibullbot removed the needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR label Jul 23, 2022
felixfontein
felixfontein approved these changes Jul 23, 2022
View reviewed changes
Copy link
Collaborator

@felixfontein felixfontein left a comment

Choose a reason for hiding this comment

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

Looks good to me! I'll merge in a few days if nobody complains.

@CactiChameleon9
Copy link
Contributor Author

CactiChameleon9 commented Jul 23, 2022 •
edited
Loading

I messed up the commit though. I add the full stop in the changelog commit. (I hadn't used rebase -i in a short while, and assumed the order commits are listed was reversed). If you want I have a pending fix I can push

@felixfontein
Copy link
Collaborator

The changelog entry looks correct to me right now. What exactly do you want to change?

@CactiChameleon9
Copy link
Contributor Author

In the changelog commit, I edit the apk.py file. Seems a bit messy

@felixfontein
Copy link
Collaborator

The changelog fragment is correct. The module is called apk, and we mention module names and not filenames in the changelog.

@CactiChameleon9
Copy link
Contributor Author

I am now happy. There are no physical changes to last time, just put the changes in the correct commits.

felixfontein
felixfontein approved these changes Jul 23, 2022
View reviewed changes
Copy link
Collaborator

@felixfontein felixfontein left a comment

Choose a reason for hiding this comment

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

Sounds good then :)

russoz
russoz approved these changes Jul 23, 2022
View reviewed changes
Copy link
Collaborator

@russoz russoz left a comment

Choose a reason for hiding this comment

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

LGTM

@felixfontein felixfontein merged commit be0e47b into ansible-collections:main Jul 26, 2022
@patchback
Copy link

patchback bot commented Jul 26, 2022 •
edited
Loading

Backport to stable-5: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-5/be0e47bfdc19843b83543c617e79e04aadefa1dc/pr-4976

Backported as #5005

🤖 @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 Jul 26, 2022
@CactiChameleon9 @patchback
Apk: add support for a custom world file (#4976)
0c07f38 
* Apk: add support for a custom world file

* Apk: Add changelog fragment for custom world file

(cherry picked from commit be0e47b)
@patchback patchback bot mentioned this pull request Jul 26, 2022
Merged
@felixfontein
Copy link
Collaborator

@CactiChameleon9 thanks for your contribution!
@russoz thanks for reviewing!

This was referenced Nov 20, 2022
Closed
Merged
Closed
Closed
Closed
Closed
Merged
Merged
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Open
Closed
Closed
Closed
Closed
Closed
Closed
This was referenced Dec 1, 2022
Open
Closed
@renovate renovate bot mentioned this pull request Dec 14, 2022
Closed
1 task
@renovate renovate bot mentioned this pull request Jan 1, 2023
Closed
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@felixfontein felixfontein felixfontein approved these changes

@russoz russoz russoz approved these changes

Assignees
No one assigned
Labels
feature This issue/PR relates to a feature request module module new_contributor Help guide this first time contributor os packaging plugins plugin (any type)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@CactiChameleon9 @ansibullbot @felixfontein @russoz