From 0f405caf247bfdf80a8aeacbf200e75c90186e4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADtor=20Vasconcellos?= <vasconcellos.dev@gmail.com>
Date: Wed, 8 May 2024 02:04:25 -0300
Subject: [PATCH] Fix CI (#2461)

Use native-tls-vendored for reqwest
 - Update prisma-client-rust
 - Fix mock_instance test
 - Clippy + fmt
 - Improve error handling when uninstall i386 libs in setup-system action
---
 .github/actions/setup-system/action.yml   |  10 ++++++----
 CONTRIBUTING.md                           |   2 +-
 Cargo.lock                                | Bin 303721 -> 303721 bytes
 Cargo.toml                                |   6 +++---
 apps/desktop/crates/linux/src/app_info.rs |   6 +++---
 apps/p2p-relay/Cargo.toml                 |   2 +-
 core/crates/sync/src/manager.rs           |   4 +---
 core/crates/sync/tests/mock_instance.rs   |   6 ++++--
 crates/cloud-api/Cargo.toml               |   4 +---
 crates/deps-generator/Cargo.toml          |   2 +-
 10 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/.github/actions/setup-system/action.yml b/.github/actions/setup-system/action.yml
index fba10941e..d6287844f 100644
--- a/.github/actions/setup-system/action.yml
+++ b/.github/actions/setup-system/action.yml
@@ -62,12 +62,14 @@ runs:
       shell: bash
       if: ${{ runner.os == 'Linux' }}
       run: |
-        dpkg -l | grep i386
-        sudo apt-get purge --allow-remove-essential libc6-i386 ".*:i386"
-        sudo dpkg --remove-architecture i386
+        set -eux
+        if dpkg -l | grep i386; then
+          sudo apt-get purge --allow-remove-essential libc6-i386 ".*:i386" || true
+          sudo dpkg --remove-architecture i386 || true
+        fi
 
         # https://github.com/actions/runner-images/issues/9546#issuecomment-2014940361
-        sudo apt-get remove libunwind-*
+        sudo apt-get remove libunwind-* || true
 
     - name: Setup Rust and Dependencies
       uses: ./.github/actions/setup-rust
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 51b6e3142..48af3989d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -166,8 +166,8 @@ Once that has completed, run `xcode-select --install` in the terminal to install
 Also ensure that Rosetta is installed, as a few of our dependencies require it. You can install Rosetta with `softwareupdate --install-rosetta --agree-to-license`.
 
 ### Translations
-Check out the [i18n README](interface/locales/README.md) for more information on how to contribute to translations.
 
+Check out the [i18n README](interface/locales/README.md) for more information on how to contribute to translations.
 
 ### Credits
 
diff --git a/Cargo.lock b/Cargo.lock
index a7176d3b98d50b0b4bd8192344d4a11863149ab8..997d6fb70b14d71a5ce47a8a8ff904010f848915 100644
GIT binary patch
delta 495
zcmaEPMCj!ap@tU5Ellf{`kNYABqkXqrx+L|8<{2=CK*~7CmSSMBqf`eq#9XRnwq4g
zq!=Wnr6?1paC%}iv-os@DkjeDvdfr$Gt$KT?R6`dQfOoJbfD2L)A`((Ii|Dqv8YVn
iv5M(6P5dz3VJ#E?bcr=ghiGDaJJ9&;4r`e;zXAYvqmv^5

delta 500
zcmaEPMCj!ap@tU5Ellf{2Bes!nI#z+nIu`5o1`VCSQ?llB^jD0Sr{g#8Ks(<8zh?<
z7#JreTPhQ&aQeax%wp38s+c&p%PwR3%}5&yw%4s-N}-Y2(}8BYOy_fB=9tdb$D%TQ
i$10}RwDHAshqX-n(<Rn09iol-?LhOlJFI2a{0aavES0wa

diff --git a/Cargo.toml b/Cargo.toml
index 0f4a61dcb..0cebcf151 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -21,19 +21,19 @@ repository = "https://github.com/spacedriveapp/spacedrive"
 
 [workspace.dependencies]
 # First party dependencies
-prisma-client-rust = { git = "https://github.com/spacedriveapp/prisma-client-rust", rev = "d6f6b224b874fad904bb17b81cf2e570c6003ac9", features = [
+prisma-client-rust = { git = "https://github.com/spacedriveapp/prisma-client-rust", rev = "528ab1cd02c25a1b183c0a8bc44e28954fdd0bfd", features = [
 	"specta",
 	"sqlite-create-many",
 	"migrations",
 	"sqlite",
 ], default-features = false }
-prisma-client-rust-cli = { git = "https://github.com/spacedriveapp/prisma-client-rust", rev = "d6f6b224b874fad904bb17b81cf2e570c6003ac9", features = [
+prisma-client-rust-cli = { git = "https://github.com/spacedriveapp/prisma-client-rust", rev = "528ab1cd02c25a1b183c0a8bc44e28954fdd0bfd", features = [
 	"specta",
 	"sqlite-create-many",
 	"migrations",
 	"sqlite",
 ], default-features = false }
-prisma-client-rust-sdk = { git = "https://github.com/spacedriveapp/prisma-client-rust", rev = "d6f6b224b874fad904bb17b81cf2e570c6003ac9", features = [
+prisma-client-rust-sdk = { git = "https://github.com/spacedriveapp/prisma-client-rust", rev = "528ab1cd02c25a1b183c0a8bc44e28954fdd0bfd", features = [
 	"sqlite",
 ], default-features = false }
 
diff --git a/apps/desktop/crates/linux/src/app_info.rs b/apps/desktop/crates/linux/src/app_info.rs
index 37e444576..01564cbfe 100644
--- a/apps/desktop/crates/linux/src/app_info.rs
+++ b/apps/desktop/crates/linux/src/app_info.rs
@@ -1,4 +1,4 @@
-use std::path::{Path, PathBuf};
+use std::path::Path;
 
 use gtk::{
 	gio::{
@@ -36,8 +36,8 @@ thread_local! {
 		// 			"This is an Glib type conversion, it should never fail because GDKAppLaunchContext is a subclass of AppLaunchContext"
 		// 		)).unwrap_or_default();
 
-		let ctx = AppLaunchContext::default();
-		ctx
+
+		AppLaunchContext::default()
 	}
 }
 
diff --git a/apps/p2p-relay/Cargo.toml b/apps/p2p-relay/Cargo.toml
index d79d7bed9..d036b062e 100644
--- a/apps/p2p-relay/Cargo.toml
+++ b/apps/p2p-relay/Cargo.toml
@@ -15,7 +15,7 @@ libp2p = { version = "0.53.2", features = [
 	"autonat",
 	"macros",
 ] }
-reqwest = { workspace = true, features = ["json"] }
+reqwest = { workspace = true, features = ["json", "native-tls-vendored"] }
 serde = { workspace = true, features = ["derive"] }
 serde_json.workspace = true
 tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
diff --git a/core/crates/sync/src/manager.rs b/core/crates/sync/src/manager.rs
index a8747bdf4..ff7c0217f 100644
--- a/core/crates/sync/src/manager.rs
+++ b/core/crates/sync/src/manager.rs
@@ -1,6 +1,4 @@
-use crate::{
-	actor::ActorTypes, crdt_op_db, db_operation::*, ingest, SharedState, SyncMessage, NTP64,
-};
+use crate::{crdt_op_db, db_operation::*, ingest, SharedState, SyncMessage, NTP64};
 
 use sd_prisma::prisma::{cloud_crdt_operation, crdt_operation, instance, PrismaClient, SortOrder};
 use sd_sync::{CRDTOperation, OperationFactory};
diff --git a/core/crates/sync/tests/mock_instance.rs b/core/crates/sync/tests/mock_instance.rs
index c4f5fc13e..84b2e4de2 100644
--- a/core/crates/sync/tests/mock_instance.rs
+++ b/core/crates/sync/tests/mock_instance.rs
@@ -1,5 +1,5 @@
 use sd_core_sync::*;
-use sd_prisma::prisma;
+use sd_prisma::prisma::{self};
 use sd_sync::CompressedCRDTOperations;
 use sd_utils::uuid_to_bytes;
 
@@ -52,7 +52,9 @@ impl Instance {
 			id,
 			&Arc::new(AtomicBool::new(true)),
 			Default::default(),
-		);
+			&Default::default(),
+		)
+		.await;
 
 		Arc::new(Self {
 			id,
diff --git a/crates/cloud-api/Cargo.toml b/crates/cloud-api/Cargo.toml
index 709bbe93c..e34d092d7 100644
--- a/crates/cloud-api/Cargo.toml
+++ b/crates/cloud-api/Cargo.toml
@@ -10,14 +10,12 @@ repository.workspace = true
 sd-p2p = { path = "../p2p" }
 
 base64 = { workspace = true }
+reqwest = { workspace = true, features = ["native-tls-vendored"] }
 rmpv = { workspace = true }
 rspc = { workspace = true }
-
 serde = { workspace = true }
 serde_json = { workspace = true }
 specta = { workspace = true }
 thiserror = { workspace = true }
 tracing = { workspace = true }
 uuid = { workspace = true }
-
-reqwest = "0.11.22"
diff --git a/crates/deps-generator/Cargo.toml b/crates/deps-generator/Cargo.toml
index 2c58af519..b5e0116d9 100644
--- a/crates/deps-generator/Cargo.toml
+++ b/crates/deps-generator/Cargo.toml
@@ -10,7 +10,7 @@ edition = { workspace = true }
 [dependencies]
 anyhow = { workspace = true }
 clap = { workspace = true, features = ["derive"] }
-reqwest = { workspace = true, features = ["blocking"] }
+reqwest = { workspace = true, features = ["blocking", "native-tls-vendored"] }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }