Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: zk-toolbox integration tests ci #2226

Merged
merged 1 commit into from
Jun 17, 2024
Merged

fix: zk-toolbox integration tests ci #2226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 1 deletion .github/workflows/ci-zk-toolbox-reusable.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ jobs:
- name: Start services
run: |
ci_localnet_up
ci_run sccache --start-server

- name: Build
run: |
Expand Down Expand Up @@ -75,6 +76,7 @@ jobs:
- name: Start services
run: |
ci_localnet_up
ci_run sccache --start-server

- name: Initialize ecosystem
run: |
Expand All @@ -88,7 +90,7 @@ jobs:

- name: Run server
run: |
ci_run zk_inception server --ignore-prerequisites &>server.log &
ci_run zk_inception server --ignore-prerequisites -a --use-node-framework --verbose &>server.log &
ci_run sleep 5

- name: Run integration tests
Expand Down
7 changes: 6 additions & 1 deletion zk_toolbox/crates/zk_inception/src/commands/args/run_server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
use clap::Parser;
use serde::{Deserialize, Serialize};

use crate::messages::{MSG_SERVER_COMPONENTS_HELP, MSG_SERVER_GENESIS_HELP};
use crate::messages::{
MSG_SERVER_ADDITIONAL_ARGS_HELP, MSG_SERVER_COMPONENTS_HELP, MSG_SERVER_GENESIS_HELP,
};

#[derive(Debug, Serialize, Deserialize, Parser)]
pub struct RunServerArgs {
#[clap(long, help = MSG_SERVER_COMPONENTS_HELP)]
pub components: Option<Vec<String>>,
#[clap(long, help = MSG_SERVER_GENESIS_HELP)]
pub genesis: bool,
#[clap(long, short)]
#[arg(trailing_var_arg = true, allow_hyphen_values = true, hide = false, help = MSG_SERVER_ADDITIONAL_ARGS_HELP)]
additional_args: Vec<String>,
}
2 changes: 2 additions & 0 deletions zk_toolbox/crates/zk_inception/src/messages.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,8 @@ pub(super) const MSG_DEPLOYING_PAYMASTER: &str = "Deploying paymaster";
/// Run server related messages
pub(super) const MSG_SERVER_COMPONENTS_HELP: &str = "Components of server to run";
pub(super) const MSG_SERVER_GENESIS_HELP: &str = "Run server in genesis mode";
pub(super) const MSG_SERVER_ADDITIONAL_ARGS_HELP: &str =
"Additional arguments that can be passed through the CLI";

/// Accept ownership related messages
pub(super) const MSG_ACCEPTING_GOVERNANCE_SPINNER: &str = "Accepting governance...";
Expand Down
Loading