Skip to content

Commit fad5fba

Browse files
authored
Add workspace and github action (#9)
1 parent e81c686 commit fad5fba

File tree

3 files changed

+52
-7
lines changed

3 files changed

+52
-7
lines changed

.github/workflows/rust.yml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Rust
2+
3+
on:
4+
push:
5+
branches: [ master ]
6+
pull_request:
7+
branches: [ master ]
8+
9+
env:
10+
CARGO_TERM_COLOR: always
11+
12+
jobs:
13+
check-style:
14+
runs-on: ubuntu-latest
15+
steps:
16+
- uses: actions/checkout@v2
17+
- name: Report rustfmt version
18+
run: cargo fmt -- --version
19+
- name: Check style
20+
run: cargo fmt -- --check
21+
build-docs:
22+
runs-on: ubuntu-latest
23+
steps:
24+
- uses: actions/checkout@v2
25+
- uses: dtolnay/rust-toolchain@nightly
26+
- name: Test build documentation
27+
run: cargo doc
28+
build-and-test:
29+
runs-on: ubuntu-latest
30+
steps:
31+
- uses: actions/checkout@v2
32+
- uses: dtolnay/rust-toolchain@nightly
33+
- name: Build
34+
run: cargo build --verbose
35+
- name: Test
36+
run: cargo test --verbose
37+

Cargo.toml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[workspace]
2+
3+
members = [
4+
"propolis",
5+
"propolis-cli",
6+
"propolis-server",
7+
]

propolis-server/src/main.rs

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -118,13 +118,14 @@ async fn instance_ensure(
118118

119119
// Create the instance.
120120
let lowmem = (properties.memory * 1024 * 1024) as usize;
121-
let instance = build_instance(&properties.id.to_string(), properties.vcpus, lowmem)
122-
.map_err(|err| {
123-
HttpError::for_internal_error(format!(
124-
"Cannot build instance: {}",
125-
err.to_string()
126-
))
127-
})?;
121+
let instance =
122+
build_instance(&properties.id.to_string(), properties.vcpus, lowmem)
123+
.map_err(|err| {
124+
HttpError::for_internal_error(format!(
125+
"Cannot build instance: {}",
126+
err.to_string()
127+
))
128+
})?;
128129

129130
// Initialize (some) of the instance's hardware.
130131
//

0 commit comments

Comments
 (0)