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

Makefile.toml: clean up clean actions #1089

Merged
merged 6 commits into from
Aug 31, 2020

Conversation

tjkirch
Copy link
Contributor

@tjkirch tjkirch commented Aug 28, 2020

Description of changes:

My overall goal was adding clean-images as a quick way to save space from large objects that are easily rebuilt. The other commits are cleanup around the "clean" space.

 Makefile.toml: make 'clean-images' remove all variant/arch images 
Makefile.toml: make clean-packages remove rpms directory

It was removing all artifacts inside and leaving an empty directory, which
doesn't match the behavior of the other clean tasks.
Makefile.toml: make clean-images remove images/arch-variant directory

It was removing all artifacts inside and leaving an empty directory, which
doesn't match the behavior of the other clean tasks.
Makefile.toml: split the clean task

This allows cleaning images, which take up the most space, without cleaning up
packages, which take a lot less space but a lot more time to rebuild.
Makefile.toml: remove deletion of 'html'

The directory is no longer created after 5e4cf9809b77.
Makefile.toml: make 'clean' delete json files from pubsys ami

Testing done:

Added set -x and ran each task individually, and the overall clean task, and saw the separated commands run OK.

Terms of contribution:

By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.

The directory is no longer created after 5e4cf98.
This allows cleaning images, which take up the most space, without cleaning up
packages, which take a lot less space but a lot more time to rebuild.
It was removing all artifacts inside and leaving an empty directory, which
doesn't match the behavior of the other clean tasks.
It was removing all artifacts inside and leaving an empty directory, which
doesn't match the behavior of the other clean tasks.
@tjkirch tjkirch requested a review from bcressey August 28, 2020 19:20
Makefile.toml Outdated Show resolved Hide resolved
@tjkirch
Copy link
Contributor Author

tjkirch commented Aug 30, 2020

^ This new commit makes clean-images remove images for all variants/arches.

@tjkirch tjkirch requested a review from bcressey August 30, 2020 18:12
Copy link
Contributor

@zmrow zmrow left a comment

Choose a reason for hiding this comment

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

🍯

@tjkirch tjkirch merged commit 1a01438 into bottlerocket-os:develop Aug 31, 2020
@tjkirch tjkirch deleted the separate-clean branch August 31, 2020 20:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants