mirror of
https://github.com/spacedriveapp/spacedrive
synced 2024-07-04 12:13:27 +00:00
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
This commit is contained in:
parent
7cd33727b3
commit
0f405caf24
10
.github/actions/setup-system/action.yml
vendored
10
.github/actions/setup-system/action.yml
vendored
|
@ -62,12 +62,14 @@ runs:
|
||||||
shell: bash
|
shell: bash
|
||||||
if: ${{ runner.os == 'Linux' }}
|
if: ${{ runner.os == 'Linux' }}
|
||||||
run: |
|
run: |
|
||||||
dpkg -l | grep i386
|
set -eux
|
||||||
sudo apt-get purge --allow-remove-essential libc6-i386 ".*:i386"
|
if dpkg -l | grep i386; then
|
||||||
sudo dpkg --remove-architecture i386
|
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
|
# 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
|
- name: Setup Rust and Dependencies
|
||||||
uses: ./.github/actions/setup-rust
|
uses: ./.github/actions/setup-rust
|
||||||
|
|
|
@ -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`.
|
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
|
### 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
|
### Credits
|
||||||
|
|
||||||
|
|
10
Cargo.lock
generated
10
Cargo.lock
generated
|
@ -7241,7 +7241,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "prisma-client-rust"
|
name = "prisma-client-rust"
|
||||||
version = "0.6.8"
|
version = "0.6.8"
|
||||||
source = "git+https://github.com/spacedriveapp/prisma-client-rust?rev=d6f6b224b874fad904bb17b81cf2e570c6003ac9#d6f6b224b874fad904bb17b81cf2e570c6003ac9"
|
source = "git+https://github.com/spacedriveapp/prisma-client-rust?rev=528ab1cd02c25a1b183c0a8bc44e28954fdd0bfd#528ab1cd02c25a1b183c0a8bc44e28954fdd0bfd"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"base64 0.13.1",
|
"base64 0.13.1",
|
||||||
"bigdecimal 0.3.1",
|
"bigdecimal 0.3.1",
|
||||||
|
@ -7274,7 +7274,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "prisma-client-rust-cli"
|
name = "prisma-client-rust-cli"
|
||||||
version = "0.6.8"
|
version = "0.6.8"
|
||||||
source = "git+https://github.com/spacedriveapp/prisma-client-rust?rev=d6f6b224b874fad904bb17b81cf2e570c6003ac9#d6f6b224b874fad904bb17b81cf2e570c6003ac9"
|
source = "git+https://github.com/spacedriveapp/prisma-client-rust?rev=528ab1cd02c25a1b183c0a8bc44e28954fdd0bfd#528ab1cd02c25a1b183c0a8bc44e28954fdd0bfd"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"directories 4.0.1",
|
"directories 4.0.1",
|
||||||
"flate2",
|
"flate2",
|
||||||
|
@ -7294,7 +7294,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "prisma-client-rust-generator"
|
name = "prisma-client-rust-generator"
|
||||||
version = "0.6.8"
|
version = "0.6.8"
|
||||||
source = "git+https://github.com/spacedriveapp/prisma-client-rust?rev=d6f6b224b874fad904bb17b81cf2e570c6003ac9#d6f6b224b874fad904bb17b81cf2e570c6003ac9"
|
source = "git+https://github.com/spacedriveapp/prisma-client-rust?rev=528ab1cd02c25a1b183c0a8bc44e28954fdd0bfd#528ab1cd02c25a1b183c0a8bc44e28954fdd0bfd"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"directories 4.0.1",
|
"directories 4.0.1",
|
||||||
"flate2",
|
"flate2",
|
||||||
|
@ -7314,7 +7314,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "prisma-client-rust-macros"
|
name = "prisma-client-rust-macros"
|
||||||
version = "0.6.8"
|
version = "0.6.8"
|
||||||
source = "git+https://github.com/spacedriveapp/prisma-client-rust?rev=d6f6b224b874fad904bb17b81cf2e570c6003ac9#d6f6b224b874fad904bb17b81cf2e570c6003ac9"
|
source = "git+https://github.com/spacedriveapp/prisma-client-rust?rev=528ab1cd02c25a1b183c0a8bc44e28954fdd0bfd#528ab1cd02c25a1b183c0a8bc44e28954fdd0bfd"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"convert_case 0.6.0",
|
"convert_case 0.6.0",
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
|
@ -7326,7 +7326,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "prisma-client-rust-sdk"
|
name = "prisma-client-rust-sdk"
|
||||||
version = "0.6.8"
|
version = "0.6.8"
|
||||||
source = "git+https://github.com/spacedriveapp/prisma-client-rust?rev=d6f6b224b874fad904bb17b81cf2e570c6003ac9#d6f6b224b874fad904bb17b81cf2e570c6003ac9"
|
source = "git+https://github.com/spacedriveapp/prisma-client-rust?rev=528ab1cd02c25a1b183c0a8bc44e28954fdd0bfd#528ab1cd02c25a1b183c0a8bc44e28954fdd0bfd"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"convert_case 0.5.0",
|
"convert_case 0.5.0",
|
||||||
"dmmf",
|
"dmmf",
|
||||||
|
|
|
@ -21,19 +21,19 @@ repository = "https://github.com/spacedriveapp/spacedrive"
|
||||||
|
|
||||||
[workspace.dependencies]
|
[workspace.dependencies]
|
||||||
# First party 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",
|
"specta",
|
||||||
"sqlite-create-many",
|
"sqlite-create-many",
|
||||||
"migrations",
|
"migrations",
|
||||||
"sqlite",
|
"sqlite",
|
||||||
], default-features = false }
|
], 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",
|
"specta",
|
||||||
"sqlite-create-many",
|
"sqlite-create-many",
|
||||||
"migrations",
|
"migrations",
|
||||||
"sqlite",
|
"sqlite",
|
||||||
], default-features = false }
|
], 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",
|
"sqlite",
|
||||||
], default-features = false }
|
], default-features = false }
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
use std::path::{Path, PathBuf};
|
use std::path::Path;
|
||||||
|
|
||||||
use gtk::{
|
use gtk::{
|
||||||
gio::{
|
gio::{
|
||||||
|
@ -36,8 +36,8 @@ thread_local! {
|
||||||
// "This is an Glib type conversion, it should never fail because GDKAppLaunchContext is a subclass of AppLaunchContext"
|
// "This is an Glib type conversion, it should never fail because GDKAppLaunchContext is a subclass of AppLaunchContext"
|
||||||
// )).unwrap_or_default();
|
// )).unwrap_or_default();
|
||||||
|
|
||||||
let ctx = AppLaunchContext::default();
|
|
||||||
ctx
|
AppLaunchContext::default()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,7 @@ libp2p = { version = "0.53.2", features = [
|
||||||
"autonat",
|
"autonat",
|
||||||
"macros",
|
"macros",
|
||||||
] }
|
] }
|
||||||
reqwest = { workspace = true, features = ["json"] }
|
reqwest = { workspace = true, features = ["json", "native-tls-vendored"] }
|
||||||
serde = { workspace = true, features = ["derive"] }
|
serde = { workspace = true, features = ["derive"] }
|
||||||
serde_json.workspace = true
|
serde_json.workspace = true
|
||||||
tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
|
tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
|
||||||
|
|
|
@ -1,6 +1,4 @@
|
||||||
use crate::{
|
use crate::{crdt_op_db, db_operation::*, ingest, SharedState, SyncMessage, NTP64};
|
||||||
actor::ActorTypes, crdt_op_db, db_operation::*, ingest, SharedState, SyncMessage, NTP64,
|
|
||||||
};
|
|
||||||
|
|
||||||
use sd_prisma::prisma::{cloud_crdt_operation, crdt_operation, instance, PrismaClient, SortOrder};
|
use sd_prisma::prisma::{cloud_crdt_operation, crdt_operation, instance, PrismaClient, SortOrder};
|
||||||
use sd_sync::{CRDTOperation, OperationFactory};
|
use sd_sync::{CRDTOperation, OperationFactory};
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
use sd_core_sync::*;
|
use sd_core_sync::*;
|
||||||
use sd_prisma::prisma;
|
use sd_prisma::prisma::{self};
|
||||||
use sd_sync::CompressedCRDTOperations;
|
use sd_sync::CompressedCRDTOperations;
|
||||||
use sd_utils::uuid_to_bytes;
|
use sd_utils::uuid_to_bytes;
|
||||||
|
|
||||||
|
@ -52,7 +52,9 @@ impl Instance {
|
||||||
id,
|
id,
|
||||||
&Arc::new(AtomicBool::new(true)),
|
&Arc::new(AtomicBool::new(true)),
|
||||||
Default::default(),
|
Default::default(),
|
||||||
);
|
&Default::default(),
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
|
||||||
Arc::new(Self {
|
Arc::new(Self {
|
||||||
id,
|
id,
|
||||||
|
|
|
@ -10,14 +10,12 @@ repository.workspace = true
|
||||||
sd-p2p = { path = "../p2p" }
|
sd-p2p = { path = "../p2p" }
|
||||||
|
|
||||||
base64 = { workspace = true }
|
base64 = { workspace = true }
|
||||||
|
reqwest = { workspace = true, features = ["native-tls-vendored"] }
|
||||||
rmpv = { workspace = true }
|
rmpv = { workspace = true }
|
||||||
rspc = { workspace = true }
|
rspc = { workspace = true }
|
||||||
|
|
||||||
serde = { workspace = true }
|
serde = { workspace = true }
|
||||||
serde_json = { workspace = true }
|
serde_json = { workspace = true }
|
||||||
specta = { workspace = true }
|
specta = { workspace = true }
|
||||||
thiserror = { workspace = true }
|
thiserror = { workspace = true }
|
||||||
tracing = { workspace = true }
|
tracing = { workspace = true }
|
||||||
uuid = { workspace = true }
|
uuid = { workspace = true }
|
||||||
|
|
||||||
reqwest = "0.11.22"
|
|
||||||
|
|
|
@ -10,7 +10,7 @@ edition = { workspace = true }
|
||||||
[dependencies]
|
[dependencies]
|
||||||
anyhow = { workspace = true }
|
anyhow = { workspace = true }
|
||||||
clap = { workspace = true, features = ["derive"] }
|
clap = { workspace = true, features = ["derive"] }
|
||||||
reqwest = { workspace = true, features = ["blocking"] }
|
reqwest = { workspace = true, features = ["blocking", "native-tls-vendored"] }
|
||||||
serde = { workspace = true, features = ["derive"] }
|
serde = { workspace = true, features = ["derive"] }
|
||||||
serde_json = { workspace = true }
|
serde_json = { workspace = true }
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue