Skip to content

Commit 12a3c21

Browse files
josephlrrbradford
authored andcommitted
CI: Remove all references to cargo-xbuild
Also, make sure that the debug build also works. Signed-off-by: Joe Richey <[email protected]>
1 parent 1931f13 commit 12a3c21

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ install:
1414
- rustup component add clippy
1515
- rustup component add rustfmt
1616
- rustup component add rust-src
17-
- cargo install cargo-xbuild
1817
- sudo apt-get install -y mtools
1918
- wget https://download.clearlinux.org/releases/28660/clear/clear-28660-kvm.img.xz
2019
- unxz clear-28660-kvm.img.xz
2120
- ./make-test-disks.sh
2221

2322
script:
24-
- cargo xbuild --release --target target.json
25-
- cargo xclippy --target target.json
23+
- cargo build --target target.json -Zbuild-std=core -Zbuild-std-features=compiler-builtins-mem
24+
- cargo build --release --target target.json -Zbuild-std=core -Zbuild-std-features=compiler-builtins-mem
25+
- cargo clippy --target target.json -Zbuild-std=core
2626
- cargo clippy --all-targets --all-features
2727
- cargo fmt --all -- --check
2828
- cargo test

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ all the way into the OS.
2424

2525
To compile:
2626

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

2929
The result will be in:
3030

run_integration_tests.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,8 @@ set -xeuf
33

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

6-
XBUILD_VERSION="0.6.2"
7-
cargo install cargo-xbuild --version $XBUILD_VERSION
8-
96
rustup component add rust-src
10-
cargo xbuild --release --target target.json
7+
cargo build --release --target target.json -Zbuild-std=core -Zbuild-std-features=compiler-builtins-mem
118

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

0 commit comments

Comments
 (0)