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

Create builds dir helpers and switch over to using them #591

Merged
merged 2 commits into from
Jul 10, 2019

Conversation

jlebon
Copy link
Member

@jlebon jlebon commented Jul 2, 2019

Only the last two commits are new here. The rest are from #590.

The strategy here is to create a Builds class and make use of it in all the commands instead of manually synthesizing paths to build dirs. Outside of cosa, one can still (and will continue to be able to) do this of course, though once the multi-arch layout comes into effect, it will require knowing which layout one is dealing with (which should be clear for e.g. pipeline code). For cosa itself, the Builds class will abstract over these differences, so all commands will keep on working regardless of the actual layout.

Requires #590.

@jlebon jlebon force-pushed the pr/build-layout-prep2 branch 3 times, most recently from ec320f3 to cbb0b5e Compare July 3, 2019 21:15
@jlebon
Copy link
Member Author

jlebon commented Jul 3, 2019

Rebased onto master!

Copy link
Contributor

@ajeddeloh ajeddeloh left a comment

Choose a reason for hiding this comment

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

LGTM, though I'm not super familiar with everything this touches.

src/cmd-build Show resolved Hide resolved
@jlebon
Copy link
Member Author

jlebon commented Jul 8, 2019

Rebased!

@jlebon
Copy link
Member Author

jlebon commented Jul 9, 2019

Gonna merge this one soonish if there are no other comments.

Copy link
Member

@cgwalters cgwalters left a comment

Choose a reason for hiding this comment

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

Overall this looks great!

src/cmdlib.py Outdated Show resolved Hide resolved
src/cmdlib.sh Show resolved Hide resolved
src/cmd-buildupload Show resolved Hide resolved
Prep for introducing a new `builds/` dir layout. This will allow us to
adapt the whole codebase to a new layout at once by enhancing the
`Builds` class.

The next commit will switch over all the commands to use these helpers.
I kept them separate for easier review.
Prep for switching those over to the new build layout.

Most commands have pretty straightforward changes. Some of the more
complex ones that deal with the build layout a lot were refactored a bit
as prep for multi-arch.
@jlebon
Copy link
Member Author

jlebon commented Jul 9, 2019

Rebased! ⬆️

@jlebon
Copy link
Member Author

jlebon commented Jul 10, 2019

Merging, thanks all for the reviews!

@jlebon jlebon merged commit da6622b into coreos:master Jul 10, 2019
@jlebon jlebon deleted the pr/build-layout-prep2 branch July 6, 2020 20:32
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.

3 participants