Skip to content

Commit 57c1ed6

Browse files
committed
fix(ci): address PR review feedback
1 parent 005f695 commit 57c1ed6

3 files changed

Lines changed: 10 additions & 5 deletions

File tree

src/console/ci/compose.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,13 @@ impl DockerCompose {
7070
/// # Errors
7171
///
7272
/// Returns an error when docker compose fails to start all services.
73-
pub fn up(&self) -> io::Result<RunningCompose> {
74-
let output = self.run_compose(&["up", "--wait", "--detach"])?;
73+
pub fn up(&self, no_build: bool) -> io::Result<RunningCompose> {
74+
let mut args = vec!["up", "--wait", "--detach"];
75+
if no_build {
76+
args.push("--no-build");
77+
}
78+
79+
let output = self.run_compose(&args)?;
7580

7681
if output.status.success() {
7782
Ok(RunningCompose {

src/console/ci/e2e/runner.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ const CONTAINER_NAME_PREFIX: &str = "tracker_";
4242
#[derive(Parser, Debug)]
4343
#[clap(author, version, about, long_about = None)]
4444
struct Args {
45-
/// Path to the JSON configuration file.
45+
/// Path to the TOML configuration file.
4646
#[clap(short, long, env = "TORRUST_TRACKER_CONFIG_TOML_PATH")]
4747
config_toml_path: Option<PathBuf>,
4848

49-
/// Direct configuration content in JSON.
49+
/// Direct configuration content in TOML.
5050
#[clap(env = "TORRUST_TRACKER_CONFIG_TOML", hide_env_values = true)]
5151
config_toml: Option<String>,
5252

src/console/ci/qbittorrent_e2e/services_setup.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ pub(crate) async fn start(
4444
if !skip_build {
4545
compose.build().context("failed to build local tracker image")?;
4646
}
47-
let running_compose = compose.up().context("failed to start qBittorrent compose stack")?;
47+
let running_compose = compose.up(skip_build).context("failed to start qBittorrent compose stack")?;
4848
let timeout = resources.timing.polling_deadline.as_duration();
4949
let (seeder, leecher) = build_clients(&compose, timeout).await?;
5050
let tracker = build_tracker_api_client(&compose, tracker_config, timeout).await?;

0 commit comments

Comments
 (0)