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.

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

deps(cli): Upgrade Edge CLI #4321

Merged
merged 1 commit into from
Nov 27, 2023
Merged
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
116 changes: 59 additions & 57 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion lib/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ virtual-net = { version = "0.6.1", path = "../virtual-net" }

# Wasmer-owned dependencies.
webc = { workspace = true }
wasmer-deploy-cli = { version = "=0.1.29", default-features = false }
wasmer-edge-cli = { version = "=0.1.0", default-features = false }

# Third-party dependencies.

Expand Down
16 changes: 8 additions & 8 deletions lib/cli/src/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use crate::commands::{
use crate::commands::{CreateObj, GenCHeader};
use crate::error::PrettyError;
use clap::{CommandFactory, Parser};
use wasmer_deploy_cli::cmd::CliCommand;
use wasmer_edge_cli::cmd::CliCommand;

/// The main function for the Wasmer CLI tool.
pub fn wasmer_main() {
Expand Down Expand Up @@ -272,19 +272,19 @@ enum Cmd {
Container(crate::commands::Container),

// Edge commands
/// Deploy apps to the Wasmer Edge.
Deploy(wasmer_deploy_cli::cmd::deploy::CmdDeploy),
/// Deploy apps to Wasmer Edge.
Deploy(wasmer_edge_cli::cmd::deploy::CmdDeploy),

/// Manage deployed apps.
/// Manage deployed Edge apps.
#[clap(subcommand, alias = "apps")]
App(wasmer_deploy_cli::cmd::app::CmdApp),
App(wasmer_edge_cli::cmd::app::CmdApp),

/// Create a dynamic on the Deploy Edge, and connect to it through SSH.
Ssh(wasmer_deploy_cli::cmd::ssh::CmdSsh),
/// Run commands/packages on Wasmer Edge in an interactive shell session.
Ssh(wasmer_edge_cli::cmd::ssh::CmdSsh),

/// Manage Wasmer namespaces.
#[clap(subcommand, alias = "namespaces")]
Namespace(wasmer_deploy_cli::cmd::namespace::CmdNamespace),
Namespace(wasmer_edge_cli::cmd::namespace::CmdNamespace),
}

fn is_binfmt_interpreter() -> bool {
Expand Down
Loading