Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,16 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
# `test_apis_up_to_date` needs a full history for the gitstubs
fetch-depth: 0
- name: Build
run: cargo build --verbose
- name: Build mock-only server
run: cargo build -p propolis-mock-server --verbose
- name: Test Libraries
run: cargo test --lib --verbose
- name: Test everything
run: cargo test --locked
# Build and test propolis-the-library on its own; `cargo test --lib` as used
# above builds the entire workspace, meaning propolis-server default features
# are used to build and run propolis-lib tests. Instead, this check uses
Expand Down
24 changes: 12 additions & 12 deletions Cargo.lock

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

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,9 @@ clap = "4.2"
const_format = "0.2"
crossbeam-channel = "0.5"
ctrlc = "3.2"
dropshot = "0.17.0"
dropshot-api-manager = "0.7.0"
dropshot-api-manager-types = "0.7.0"
dropshot = "0.16.7"
dropshot-api-manager = "0.6.0"
dropshot-api-manager-types = "0.6.0"
erased-serde = "0.4"
errno = "0.2.8"
escargot = "0.5.8"
Expand Down
5 changes: 1 addition & 4 deletions bin/mock-server/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ use std::sync::Arc;

use anyhow::anyhow;
use clap::Parser;
use dropshot::{
CompressionConfig, ConfigDropshot, HandlerTaskMode, HttpServerStarter,
};
use dropshot::{ConfigDropshot, HandlerTaskMode, HttpServerStarter};
use slog::{info, Drain};

#[derive(Debug, Parser)]
Expand Down Expand Up @@ -115,7 +113,6 @@ async fn main() -> anyhow::Result<()> {
default_request_body_max_bytes: 1024 * 1024, // 1M for ISO bytes
default_handler_task_mode: HandlerTaskMode::Detached,
log_headers: vec![],
compression: CompressionConfig::None,
};

let log = build_logger();
Expand Down
5 changes: 2 additions & 3 deletions bin/propolis-server/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ use propolis_server::{
use anyhow::{anyhow, Context};
use clap::Parser;
use dropshot::{
ClientSpecifiesVersionInHeader, CompressionConfig, ConfigDropshot,
HandlerTaskMode, VersionPolicy,
ClientSpecifiesVersionInHeader, ConfigDropshot, HandlerTaskMode,
VersionPolicy,
};
use slog::{info, Logger};

Expand Down Expand Up @@ -312,7 +312,6 @@ fn main() -> anyhow::Result<()> {
default_request_body_max_bytes: 1024 * 1024, // 1M for ISO bytes
default_handler_task_mode: HandlerTaskMode::Detached,
log_headers: vec![],
compression: CompressionConfig::None,
};

let log = build_logger(log_level);
Expand Down