From 839cbb6cdaf38a3ac8e86d4a70b75d1223259327 Mon Sep 17 00:00:00 2001
From: MasterPtato <maxpopkov.contact@gmail.com>
Date: Thu, 10 Jul 2025 23:18:58 +0000
Subject: [PATCH] fix(toolchain): dont upgrade for deploys by default

---
 packages/toolchain/cli/src/commands/actor/create.rs   |  2 +-
 packages/toolchain/cli/src/commands/build/publish.rs  |  6 +++---
 packages/toolchain/cli/src/commands/deploy.rs         |  6 +++---
 packages/toolchain/cli/src/util/deploy.rs             |  4 ++--
 .../toolchain/src/tasks/build_publish/mod.rs          | 11 ++++-------
 packages/toolchain/toolchain/src/tasks/deploy/mod.rs  |  4 ++--
 6 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/packages/toolchain/cli/src/commands/actor/create.rs b/packages/toolchain/cli/src/commands/actor/create.rs
index 5e01080b97..10dca2b05c 100644
--- a/packages/toolchain/cli/src/commands/actor/create.rs
+++ b/packages/toolchain/cli/src/commands/actor/create.rs
@@ -203,7 +203,7 @@ impl Opts {
 				skip_route_creation: None,
 				keep_existing_routes: None,
 				non_interactive: false,
-				skip_upgrade: false,
+				upgrade: false,
 			})
 			.await?;
 
diff --git a/packages/toolchain/cli/src/commands/build/publish.rs b/packages/toolchain/cli/src/commands/build/publish.rs
index e2170a0593..e3965254d1 100644
--- a/packages/toolchain/cli/src/commands/build/publish.rs
+++ b/packages/toolchain/cli/src/commands/build/publish.rs
@@ -56,9 +56,9 @@ pub struct Opts {
 	#[clap(long)]
 	unstable_compression: Option<config::build::Compression>,
 
-	/// Skip upgrading actors
+	/// Upgrade existing actors with the new build after publishing
 	#[clap(long)]
-	skip_upgrade: bool,
+	upgrade: bool,
 
 	// Docker options
 	/// Specify a pre-built Docker image instead of building from a Dockerfile
@@ -174,7 +174,7 @@ impl Opts {
 				version_name,
 				build_name: self.name.clone(),
 				runtime,
-				skip_upgrade: self.skip_upgrade,
+				upgrade: self.upgrade,
 			},
 		)
 		.await?;
diff --git a/packages/toolchain/cli/src/commands/deploy.rs b/packages/toolchain/cli/src/commands/deploy.rs
index 6853898b2f..8ae84c0286 100644
--- a/packages/toolchain/cli/src/commands/deploy.rs
+++ b/packages/toolchain/cli/src/commands/deploy.rs
@@ -31,9 +31,9 @@ pub struct Opts {
 	#[clap(long)]
 	non_interactive: bool,
 
-	/// Skip upgrading actors
+	/// Update existing actors with the new build after deploying
 	#[clap(long)]
-	skip_upgrade: bool,
+	upgrade: bool,
 }
 
 impl Opts {
@@ -65,7 +65,7 @@ impl Opts {
 			skip_route_creation: self.skip_route_creation,
 			keep_existing_routes: self.keep_existing_routes,
 			non_interactive: self.non_interactive,
-			skip_upgrade: self.skip_upgrade,
+			upgrade: self.upgrade,
 		})
 		.await?;
 
diff --git a/packages/toolchain/cli/src/util/deploy.rs b/packages/toolchain/cli/src/util/deploy.rs
index 8b0dd53b36..32bf4b7b3d 100644
--- a/packages/toolchain/cli/src/util/deploy.rs
+++ b/packages/toolchain/cli/src/util/deploy.rs
@@ -91,7 +91,7 @@ pub struct DeployOpts<'a> {
 	pub skip_route_creation: Option<bool>,
 	pub keep_existing_routes: Option<bool>,
 	pub non_interactive: bool,
-	pub skip_upgrade: bool,
+	pub upgrade: bool,
 }
 
 pub async fn deploy(opts: DeployOpts<'_>) -> Result<Vec<Uuid>> {
@@ -258,7 +258,7 @@ pub async fn deploy(opts: DeployOpts<'_>) -> Result<Vec<Uuid>> {
 			filter_tags: opts.filter_tags.clone(),
 			build_tags: opts.build_tags.clone(),
 			version_name: opts.version.clone(),
-			skip_upgrade: opts.skip_upgrade,
+			upgrade: opts.upgrade,
 		},
 	)
 	.await?;
diff --git a/packages/toolchain/toolchain/src/tasks/build_publish/mod.rs b/packages/toolchain/toolchain/src/tasks/build_publish/mod.rs
index acd3ba541e..8f16679f42 100644
--- a/packages/toolchain/toolchain/src/tasks/build_publish/mod.rs
+++ b/packages/toolchain/toolchain/src/tasks/build_publish/mod.rs
@@ -26,7 +26,7 @@ pub struct Input {
 	pub build_name: String,
 	pub runtime: config::build::Runtime,
 	#[serde(default)]
-	pub skip_upgrade: bool,
+	pub upgrade: bool,
 }
 
 #[derive(Serialize)]
@@ -64,7 +64,7 @@ impl task::Task for Task {
 			input.build_name.clone(),
 			input.build_tags.clone(),
 			&input.runtime,
-			input.skip_upgrade,
+			input.upgrade,
 		)
 		.await?;
 
@@ -83,7 +83,7 @@ async fn build_and_upload(
 	build_name: String,
 	extra_build_tags: Option<HashMap<String, String>>,
 	runtime: &Runtime,
-	skip_upgrade: bool,
+	upgrade: bool,
 ) -> Result<Uuid> {
 	task.log("");
 
@@ -171,8 +171,7 @@ async fn build_and_upload(
 	}
 	complete_res.context("complete_res")?;
 
-	// Upgrade actors
-	if !skip_upgrade {
+	if upgrade {
 		task.log(format!("[Upgrading Actors]"));
 		let res = apis::actors_api::actors_upgrade_all(
 			&ctx.openapi_config_cloud,
@@ -193,8 +192,6 @@ async fn build_and_upload(
 			res.count,
 			if res.count == 1 { "" } else { "s" }
 		));
-	} else {
-		task.log(format!("[Skipping Actor Upgrade]"));
 	}
 
 	let hub_origin = &ctx.bootstrap.origins.hub;
diff --git a/packages/toolchain/toolchain/src/tasks/deploy/mod.rs b/packages/toolchain/toolchain/src/tasks/deploy/mod.rs
index 3613be79c8..d1b3074602 100644
--- a/packages/toolchain/toolchain/src/tasks/deploy/mod.rs
+++ b/packages/toolchain/toolchain/src/tasks/deploy/mod.rs
@@ -18,7 +18,7 @@ pub struct Input {
 	pub filter_tags: Option<HashMap<String, String>>,
 	pub build_tags: Option<HashMap<String, String>>,
 	pub version_name: Option<String>,
-	pub skip_upgrade: bool,
+	pub upgrade: bool,
 }
 
 #[derive(Serialize)]
@@ -132,7 +132,7 @@ async fn perform_builds(
 				version_name: version_name.to_string(),
 				build_name: build_name.to_string(),
 				runtime: build.runtime.clone(),
-				skip_upgrade: input.skip_upgrade,
+				upgrade: input.upgrade,
 			},
 		)
 		.await?;