Skip to content

Commit

Permalink
CI: Remove all references to cargo-xbuild
Browse files Browse the repository at this point in the history
Also, make sure that the debug build also works.

Signed-off-by: Joe Richey <[email protected]>
  • Loading branch information
josephlr authored and rbradford committed Oct 2, 2020
1 parent 1931f13 commit 12a3c21
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ install:
- rustup component add clippy
- rustup component add rustfmt
- rustup component add rust-src
- cargo install cargo-xbuild
- sudo apt-get install -y mtools
- wget https://download.clearlinux.org/releases/28660/clear/clear-28660-kvm.img.xz
- unxz clear-28660-kvm.img.xz
- ./make-test-disks.sh

script:
- cargo xbuild --release --target target.json
- cargo xclippy --target target.json
- cargo build --target target.json -Zbuild-std=core -Zbuild-std-features=compiler-builtins-mem
- cargo build --release --target target.json -Zbuild-std=core -Zbuild-std-features=compiler-builtins-mem
- cargo clippy --target target.json -Zbuild-std=core
- cargo clippy --all-targets --all-features
- cargo fmt --all -- --check
- cargo test
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ all the way into the OS.

To compile:

cargo xbuild --release --target target.json
cargo build --release --target target.json -Zbuild-std=core -Zbuild-std-features=compiler-builtins-mem

The result will be in:

Expand Down
5 changes: 1 addition & 4 deletions run_integration_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,8 @@ set -xeuf

source "${CARGO_HOME:-$HOME/.cargo}/env"

XBUILD_VERSION="0.6.2"
cargo install cargo-xbuild --version $XBUILD_VERSION

rustup component add rust-src
cargo xbuild --release --target target.json
cargo build --release --target target.json -Zbuild-std=core -Zbuild-std-features=compiler-builtins-mem

CH_VERSION="v0.8.0"
CH_URL="https://github.com/cloud-hypervisor/cloud-hypervisor/releases/download/$CH_VERSION/cloud-hypervisor"
Expand Down

0 comments on commit 12a3c21

Please sign in to comment.