Skip to content

Commit

Permalink
Use native-tls-vendored for reqwest
Browse files Browse the repository at this point in the history
 - Update prisma-client-rust
 - Fix mock_instance test
 - Clippy + fmt
 - Improve error handling when uninstall i386 libs in setup-system action
  • Loading branch information
HeavenVolkoff committed May 8, 2024
1 parent 7cd3372 commit c59c17c
Show file tree
Hide file tree
Showing 10 changed files with 26 additions and 26 deletions.
10 changes: 6 additions & 4 deletions .github/actions/setup-system/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
10 changes: 5 additions & 5 deletions Cargo.lock

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

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }

Expand Down
6 changes: 3 additions & 3 deletions apps/desktop/crates/linux/src/app_info.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use std::path::{Path, PathBuf};
use std::path::Path;

use gtk::{
gio::{
Expand Down Expand Up @@ -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()
}
}

Expand Down
2 changes: 1 addition & 1 deletion apps/p2p-relay/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down
4 changes: 1 addition & 3 deletions core/crates/sync/src/manager.rs
Original file line number Diff line number Diff line change
@@ -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};
Expand Down
6 changes: 4 additions & 2 deletions core/crates/sync/tests/mock_instance.rs
Original file line number Diff line number Diff line change
@@ -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;

Expand Down Expand Up @@ -52,7 +52,9 @@ impl Instance {
id,
&Arc::new(AtomicBool::new(true)),
Default::default(),
);
&Default::default(),
)
.await;

Arc::new(Self {
id,
Expand Down
4 changes: 1 addition & 3 deletions crates/cloud-api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion crates/deps-generator/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }

Expand Down

0 comments on commit c59c17c

Please sign in to comment.