Merge pull request #157 from filecoin-project/fix/merge_application

clriesco · web-flow · commit 20d0f3813f0f · 2024-03-18T12:54:33.000+01:00
fix merge application in db
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/fplus-database/src/database/applications.rs b/fplus-database/src/database/applications.rs
@@ -218,6 +218,7 @@ pub async fn merge_application_by_pr_number(owner: String, repo: String, pr_numb
     hasher.update(application.as_bytes());
     let file_sha = format!("{:x}", hasher.finalize());
     merged_application.sha = Set(Some(file_sha));
+    merged_application.application = Set(pr_application.application.clone());
 
     pr_application.delete(&conn).await?;
 
diff --git a/fplus-http-server/Cargo.toml b/fplus-http-server/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "fplus-http-server"
 authors = ["jbesraa", "kokal33", "clriesco"]
-version = "1.3.0"
+version = "1.4.0"
 description = "FPlus main http module"
 license = "MIT OR Apache-2.0"
 edition = "2021"
