ci: Clean up

This commit is contained in:
Jonas Platte 2021-05-06 14:31:19 +02:00
parent 729fb51d77
commit db327e7d9c
No known key found for this signature in database
GPG Key ID: CC154DE0E30B7C67

View File

@ -43,26 +43,18 @@ impl CiTask {
}
fn build_stable(&self) -> xshell::Result<()> {
vec![
cmd!("rustup run stable cargo test --workspace").run(),
cmd!("rustup run stable cargo test -p ruma-identifiers --no-default-features").run(),
cmd!("rustup run stable cargo test -p ruma-identifiers --all-features").run(),
cmd!("rustup run stable cargo test -p ruma-client-api --all-features").run(),
cmd!("rustup run stable cargo check -p ruma-client --no-default-features").run(),
cmd!("rustup run stable cargo check -p ruma-client --all-features").run(),
]
.into_iter()
.collect()
// 1. Make sure everything compiles
cmd!("rustup run stable cargo check --workspace --all-features").run()?;
cmd!("rustup run stable cargo check -p ruma-client --no-default-features").run()?;
cmd!("rustup run stable cargo check -p ruma-identifiers --no-default-features").run()?;
// 2. Run tests
cmd!("rustup run stable cargo test --workspace").run()
}
fn build_nightly(&self) -> xshell::Result<()> {
vec![
cmd!("rustup run nightly cargo fmt -- --check").run(),
cmd!("rustup run nightly cargo ruma-clippy -D warnings").run(),
cmd!("rustup run nightly cargo clippy -p ruma-client --all-targets -- -D warnings")
.run(),
]
.into_iter()
.collect()
let fmt_res = cmd!("rustup run nightly cargo fmt -- --check").run();
let clippy_res = cmd!("rustup run nightly cargo ruma-clippy -D warnings").run();
fmt_res.or(clippy_res)
}
}