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

Follow directory when deploying from create #4932

Merged
merged 2 commits into from
Jul 15, 2024
Merged

Follow directory when deploying from create #4932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c751d9d
fix(app/create): Follow directory when deploying from create
xdoardo Jul 15, 2024
1766021
chore: Update yanked `bytes` version
xdoardo Jul 15, 2024
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
48 changes: 24 additions & 24 deletions Cargo.lock
View file
Open in desktop

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

19 changes: 12 additions & 7 deletions lib/cli/src/commands/app/create.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ impl CmdAppCreate {
if self.use_local_manifest || ask_confirmation()? {
let app_config = self.get_app_config(owner, app_name, ".");
write_app_config(&app_config, self.app_dir_path.clone()).await?;
self.try_deploy(owner, app_name).await?;
self.try_deploy(owner, app_name, None).await?;
return Ok(true);
}

Expand All @@ -287,7 +287,7 @@ impl CmdAppCreate {
if let Some(pkg) = &self.package {
let app_config = self.get_app_config(owner, app_name, pkg);
write_app_config(&app_config, Some(output_path.clone())).await?;
self.try_deploy(owner, app_name).await?;
self.try_deploy(owner, app_name, Some(&output_path)).await?;
return Ok(true);
} else if !self.non_interactive {
let (package_id, _) = crate::utils::prompts::prompt_for_package(
Expand All @@ -303,8 +303,8 @@ impl CmdAppCreate {
.await?;

let app_config = self.get_app_config(owner, app_name, &package_id.to_string());
write_app_config(&app_config, Some(output_path)).await?;
self.try_deploy(owner, app_name).await?;
write_app_config(&app_config, Some(output_path.clone())).await?;
self.try_deploy(owner, app_name, Some(&output_path)).await?;
return Ok(true);
} else {
eprintln!(
Expand Down Expand Up @@ -705,13 +705,18 @@ the app:\n"
format!("{bin_name} deploy").bold()
)
} else {
self.try_deploy(owner, app_name).await?;
self.try_deploy(owner, app_name, Some(&output_path)).await?;
}

Ok(true)
}

async fn try_deploy(&self, owner: &str, app_name: &str) -> anyhow::Result<()> {
async fn try_deploy(
&self,
owner: &str,
app_name: &str,
path: Option<&Path>,
) -> anyhow::Result<()> {
let interactive = !self.non_interactive;
let theme = dialoguer::theme::ColorfulTheme::default();

Expand All @@ -732,7 +737,7 @@ the app:\n"
non_interactive: self.non_interactive,
publish_package: true,
dir: self.app_dir_path.clone(),
path: None,
path: path.map(|v| v.to_path_buf()),
no_wait: self.no_wait,
no_default: false,
no_persist_id: false,
Expand Down
Loading