Skip to content

Commit

Permalink
add --skip-build option
Browse files Browse the repository at this point in the history
  • Loading branch information
pplisd committed Feb 6, 2023
1 parent cb68080 commit 4fd3134
Showing 1 changed file with 25 additions and 16 deletions.
41 changes: 25 additions & 16 deletions cli/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,10 @@ pub enum Command {
/// Arguments to pass to the underlying `cargo build-bpf` command.
#[clap(required = false, last = true)]
cargo_args: Vec<String>,
/// Flag to skip building the program in the workspace,
/// use this to save time when running verify and the program code is already built.
#[clap(long, required = false)]
skip_build: bool,
},
#[clap(name = "test", alias = "t")]
/// Runs integration tests against a localnetwork.
Expand Down Expand Up @@ -432,6 +436,7 @@ pub fn entry(opts: Opts) -> Result<()> {
bootstrap,
env,
cargo_args,
skip_build,
} => verify(
&opts.cfg_override,
program_id,
Expand All @@ -441,6 +446,7 @@ pub fn entry(opts: Opts) -> Result<()> {
bootstrap,
env,
cargo_args,
skip_build,
),
Command::Clean => clean(&opts.cfg_override),
Command::Deploy {
Expand Down Expand Up @@ -1350,6 +1356,7 @@ fn verify(
bootstrap: BootstrapMode,
env_vars: Vec<String>,
cargo_args: Vec<String>,
skip_build: bool
) -> Result<()> {
// Change to the workspace member directory, if needed.
if let Some(program_name) = program_name.as_ref() {
Expand All @@ -1362,22 +1369,24 @@ fn verify(

// Build the program we want to verify.
let cur_dir = std::env::current_dir()?;
build(
cfg_override,
None, // idl
None, // idl ts
true, // verifiable
true, // skip lint
None, // program name
solana_version.or_else(|| cfg.solana_version.clone()), // solana version
docker_image, // docker image
bootstrap, // bootstrap docker image
None, // stdout
None, // stderr
env_vars,
cargo_args,
false,
)?;
if !skip_build {
build(
cfg_override,
None, // idl
None, // idl ts
true, // verifiable
true, // skip lint
None, // program name
solana_version.or_else(|| cfg.solana_version.clone()), // solana version
docker_image, // docker image
bootstrap, // bootstrap docker image
None, // stdout
None, // stderr
env_vars,
cargo_args,
false,
)?;
}
std::env::set_current_dir(cur_dir)?;

// Verify binary.
Expand Down

0 comments on commit 4fd3134

Please sign in to comment.