Skip to content

Commit

Permalink
test_infra: Enable cross-build for "musl" and "aarch64" targets
Browse files Browse the repository at this point in the history
With enabling the `vendered-openssl` feature, we can now cross-build the
`test_infra` crate for  "musl" and "aarch64" targets. In this way, we
can remove the `test_infra` crate from the "exclude" list, so that this
crate can be checked and processed by "cargo clippy" and "cargo fmt".

More details can be found: https://docs.rs/openssl/latest/openssl/#vendored

As 'musl-gcc' is required, this commit also installs the `musl-tools`
package for our "build" github action on the musl target [1].

[1] actions-rs/toolchain#102

Signed-off-by: Bo Chen <chen.bo@intel.com>
  • Loading branch information
likebreath authored and rbradford committed Feb 17, 2022
1 parent f1151cb commit 0ab4097
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ jobs:
with:
fetch-depth: 0

- name: Install musl-gcc
run: sudo apt install -y musl-tools

- name: Install Rust toolchain (${{ matrix.rust }})
uses: actions-rs/toolchain@v1
with:
Expand Down
10 changes: 10 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,3 @@ members = [
"vm-migration",
"vm-virtio"
]
exclude = ["test_infra"]
2 changes: 1 addition & 1 deletion test_infra/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ dirs = "3.0.1"
epoll = "4.3.1"
lazy_static= "1.4.0"
libc = "0.2.91"
ssh2 = "0.9.1"
ssh2 = { version = "0.9.1", features = ["vendored-openssl"]}
vmm-sys-util = "0.9.0"
wait-timeout = "0.2.0"

0 comments on commit 0ab4097

Please sign in to comment.