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

build: use twoliter make #3342

Merged
merged 1 commit into from
Aug 18, 2023
Merged

Conversation

webern
Copy link
Member

@webern webern commented Aug 11, 2023

TODO

  • Merge the twoliter make command in the Twoliter repository and add a tag
  • Use the Twoliter tag here instead of a sha

Issue number:

Related to #2669

Description of changes:

In order support out-of-tree builds (see #2669 and https://github.com/bottlerocket-os/twoliter), we need to move the build system to the Twoliter repository. This commit starts this process by moving the Makefile.toml logic to Twoliter and using Twoliter as a facade over the build system.

Testing done:

  • cargo make build
  • cargo make ami
  • Test in the automated, internal build systems including testsys.

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.

Makefile.toml Outdated Show resolved Hide resolved
Makefile.toml Outdated Show resolved Hide resolved
@webern webern changed the title build: use twoliter exec build: use twoliter make Aug 17, 2023
@webern
Copy link
Member Author

webern commented Aug 17, 2023

@webern
Copy link
Member Author

webern commented Aug 17, 2023

@webern
Copy link
Member Author

webern commented Aug 17, 2023

https://github.com/bottlerocket-os/bottlerocket/compare/e8d448455f7e859dee2a16b559619de135946ac2..e756eb62bb290ab7e0825ddf22be678be0b1eac7

Cleanup and twoliter now installs to a tempdir so we don't need an ignored directory.

Copy link
Contributor

@bcressey bcressey left a comment

Choose a reason for hiding this comment

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

LGTM

Twoliter.toml Outdated Show resolved Hide resolved
Makefile.toml Outdated Show resolved Hide resolved
@webern webern force-pushed the twoliter-exec branch 2 times, most recently from fe96dfc to 680533e Compare August 17, 2023 20:49
@webern
Copy link
Member Author

webern commented Aug 17, 2023

@webern
Copy link
Member Author

webern commented Aug 18, 2023

https://github.com/bottlerocket-os/bottlerocket/compare/680533ed5dd26673f120515ba334da0c0df17dcc..ec847e10fd577be1799e52e391992fcb88196398

  • Eliminate the confusing SDK and version keys in Twoliter.toml (they aren't doing anything yet).
  • Eliminate the jobs restriction in the cargo install of twoliter.

In order support out-of-tree builds (see bottlerocket-os#2669 and
https://github.com/bottlerocket-os/twoliter), we need to move the
build system to the Twoliter repository. This commit starts this
process by moving the Makefile.toml logic to Twoliter and using
Twoliter as a facade over the build system.
@webern
Copy link
Member Author

webern commented Aug 18, 2023

@webern webern marked this pull request as ready for review August 18, 2023 18:32
Copy link
Contributor

@stmcginnis stmcginnis left a comment

Choose a reason for hiding this comment

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

Changes look good to me. Checked out locally and verified the ability to build. A little extra delay getting twoliter set up initially, but no issues getting a good build.

@webern webern merged commit 00eef00 into bottlerocket-os:develop Aug 18, 2023
42 checks passed
@webern webern deleted the twoliter-exec branch August 18, 2023 20:47
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.

None yet

3 participants