Use cross-rs for building in CI#359
Merged
Mossaka merged 1 commit intocontainerd:mainfrom Oct 19, 2023
Merged
Conversation
aefbb0b to
9bf40fe
Compare
jsturtevant
reviewed
Oct 18, 2023
5baa8b5 to
3e9329f
Compare
3e9329f to
71b5255
Compare
Signed-off-by: Jorge Prendes <jorge.prendes@gmail.com>
71b5255 to
217800a
Compare
Contributor
|
LGTM |
cross-rs for building in CI
Mossaka
approved these changes
Oct 19, 2023
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR switches CI to use the
cross-rssupport introduced in #332.This should unblock #356.
This PR uses
cross-rsfor the linux builds of the shims. It generates alinux-musland alinux-gnuartifacts usingmuslandglibcrespectively.It also stops building the shims on
ubuntu-20.04. Since thecross-rsbuild happens in a container it is not necessary to build on different OS versions. However, we keep running e2e tests inubuntu-20.04to maintain test coverage on an OS runningcgroups-v1.The e2e tests are switched to use the
muslbuild of the shims, as this would unblock #356.Since
cross-rsuses an olderglibcversion, it might be possible to also enable e2e tests usingglibc, but I suggest we defer that to another PR after #356 is merged.There are some complications around running the unit tests with
cross-rs. This PR works around those issues by building the tests withcross-rs, but running them in the host. See #359 (comment) for more details.