From 897018c44fc45f76c1e9367cedef763f26331c84 Mon Sep 17 00:00:00 2001 From: John Beresford Date: Fri, 24 Jan 2025 14:50:27 -0800 Subject: [PATCH 1/2] chore: remove vendored deps --- Cargo.lock | 215 ++------------------ Cargo.toml | 3 +- packages/client/Cargo.toml | 1 - packages/codegen/Cargo.toml | 3 - packages/db/Cargo.toml | 2 - packages/service/Cargo.toml | 4 +- plugins/retrom-plugin-installer/Cargo.toml | 1 - plugins/retrom-plugin-launcher/Cargo.toml | 2 - plugins/retrom-plugin-standalone/Cargo.toml | 1 - 9 files changed, 16 insertions(+), 216 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 22720de5..84b62f7e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2669,12 +2669,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "inventory" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f958d3d68f4167080a18141e10381e7634563984a537f2a49a30fd8e53ac5767" - [[package]] name = "ipnet" version = "2.10.1" @@ -2719,15 +2713,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" -dependencies = [ - "either", -] - [[package]] name = "itoa" version = "0.4.8" @@ -3801,15 +3786,6 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" -[[package]] -name = "openssl-src" -version = "300.4.1+3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faa4eac4138c62414b5622d1b31c5c304f34b406b013c079c2bbc652fdd6678c" -dependencies = [ - "cc", -] - [[package]] name = "openssl-sys" version = "0.9.104" @@ -3818,7 +3794,6 @@ checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" dependencies = [ "cc", "libc", - "openssl-src", "pkg-config", "vcpkg", ] @@ -4368,23 +4343,12 @@ dependencies = [ "zerocopy", ] -[[package]] -name = "pq-src" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28fbf44fbf1d3e50d0ca0c6e6253f65d1bf01bb004a6ea553efb32e7081948c7" -dependencies = [ - "cc", - "openssl-sys", -] - [[package]] name = "pq-sys" version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6cc05d7ea95200187117196eee9edd0644424911821aeb28a18ce60ea0b8793" dependencies = [ - "pq-src", "vcpkg", ] @@ -4470,17 +4434,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ "bytes", - "prost-derive 0.12.6", -] - -[[package]] -name = "prost" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c0fef6c4230e4ccf618a35c59d7ede15dea37de8427500f50aff708806e42ec" -dependencies = [ - "bytes", - "prost-derive 0.13.4", + "prost-derive", ] [[package]] @@ -4491,34 +4445,14 @@ checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" dependencies = [ "bytes", "heck 0.5.0", - "itertools 0.12.1", + "itertools", "log", "multimap", "once_cell", "petgraph", "prettyplease", - "prost 0.12.6", - "prost-types 0.12.6", - "regex", - "syn 2.0.90", - "tempfile", -] - -[[package]] -name = "prost-build" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f3e5beed80eb580c68e2c600937ac2c4eedabdfd5ef1e5b7ea4f3fba84497b" -dependencies = [ - "heck 0.5.0", - "itertools 0.13.0", - "log", - "multimap", - "once_cell", - "petgraph", - "prettyplease", - "prost 0.13.4", - "prost-types 0.13.4", + "prost", + "prost-types", "regex", "syn 2.0.90", "tempfile", @@ -4531,20 +4465,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" dependencies = [ "anyhow", - "itertools 0.12.1", - "proc-macro2", - "quote", - "syn 2.0.90", -] - -[[package]] -name = "prost-derive" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "157c5a9d7ea5c2ed2d9fb8f495b64759f7816c7eaea54ba3978f0d63000162e3" -dependencies = [ - "anyhow", - "itertools 0.13.0", + "itertools", "proc-macro2", "quote", "syn 2.0.90", @@ -4556,62 +4477,7 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" dependencies = [ - "prost 0.12.6", -] - -[[package]] -name = "prost-types" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2f1e56baa61e93533aebc21af4d2134b70f66275e0fcdf3cbe43d77ff7e8fc" -dependencies = [ - "prost 0.13.4", -] - -[[package]] -name = "prost-wkt" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8d84e2bee181b04c2bac339f2bfe818c46a99750488cc6728ce4181d5aa8299" -dependencies = [ - "chrono", - "inventory", - "prost 0.13.4", - "serde", - "serde_derive", - "serde_json", - "typetag", -] - -[[package]] -name = "prost-wkt-build" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a669d5acbe719010c6f62a64e6d7d88fdedc1fe46e419747949ecb6312e9b14" -dependencies = [ - "heck 0.5.0", - "prost 0.13.4", - "prost-build 0.13.4", - "prost-types 0.13.4", - "quote", -] - -[[package]] -name = "prost-wkt-types" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ef068e9b82e654614b22e6b13699bd545b6c0e2e721736008b00b38aeb4f64" -dependencies = [ - "chrono", - "prost 0.13.4", - "prost-build 0.13.4", - "prost-types 0.13.4", - "prost-wkt", - "prost-wkt-build", - "regex", - "serde", - "serde_derive", - "serde_json", + "prost", ] [[package]] @@ -4983,9 +4849,8 @@ version = "0.7.0" dependencies = [ "dotenvy", "futures", - "openssl-sys", "pq-sys", - "prost 0.12.6", + "prost", "retrom-codegen", "retrom-plugin-config", "retrom-plugin-installer", @@ -5018,11 +4883,8 @@ name = "retrom-codegen" version = "0.7.0" dependencies = [ "diesel", - "prost 0.12.6", - "prost-types 0.12.6", - "prost-wkt", - "prost-wkt-build", - "prost-wkt-types", + "prost", + "prost-types", "retrom-db", "serde", "serde_json", @@ -5041,8 +4903,6 @@ dependencies = [ "diesel", "diesel-async", "diesel_migrations", - "dotenvy", - "openssl-sys", "postgresql_commands", "postgresql_embedded", "pq-sys", @@ -5072,7 +4932,6 @@ dependencies = [ name = "retrom-plugin-installer" version = "0.7.0" dependencies = [ - "dotenvy", "futures", "reqwest", "retrom-codegen", @@ -5093,7 +4952,6 @@ dependencies = [ name = "retrom-plugin-launcher" version = "0.7.0" dependencies = [ - "dotenvy", "hyper 0.14.31", "hyper-rustls 0.25.0", "hyper-util", @@ -5102,7 +4960,6 @@ dependencies = [ "retrom-plugin-installer", "retrom-plugin-service-client", "retrom-plugin-steam", - "retry", "serde", "tauri", "tauri-plugin", @@ -5151,7 +5008,6 @@ dependencies = [ "thiserror 1.0.69", "tokio", "tracing", - "urlencoding", ] [[package]] @@ -5193,8 +5049,7 @@ dependencies = [ "http-body-util", "hyper 0.14.31", "hyper-util", - "notify", - "prost 0.12.6", + "prost", "reqwest", "retrom-codegen", "retrom-db", @@ -5204,7 +5059,6 @@ dependencies = [ "serde_json", "thiserror 1.0.69", "tokio", - "tokio-retry", "tokio-stream", "tokio-util", "tonic", @@ -6852,17 +6706,6 @@ dependencies = [ "whoami", ] -[[package]] -name = "tokio-retry" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f" -dependencies = [ - "pin-project", - "rand 0.8.5", - "tokio", -] - [[package]] name = "tokio-rustls" version = "0.25.0" @@ -7007,7 +6850,7 @@ dependencies = [ "hyper-timeout", "percent-encoding", "pin-project", - "prost 0.12.6", + "prost", "rustls-native-certs", "rustls-pemfile", "rustls-pki-types", @@ -7029,7 +6872,7 @@ checksum = "be4ef6dd70a610078cb4e338a0f79d06bc759ff1b22d2120c2ff02ae264ba9c2" dependencies = [ "prettyplease", "proc-macro2", - "prost-build 0.12.6", + "prost-build", "quote", "syn 2.0.90", ] @@ -7040,8 +6883,8 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "548c227bd5c0fae5925812c4ec6c66ffcfced23ea370cb823f4d18f0fc1cb6a7" dependencies = [ - "prost 0.12.6", - "prost-types 0.12.6", + "prost", + "prost-types", "tokio", "tokio-stream", "tonic", @@ -7294,30 +7137,6 @@ version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" -[[package]] -name = "typetag" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ba3b6e86ffe0054b2c44f2d86407388b933b16cb0a70eea3929420db1d9bbe" -dependencies = [ - "erased-serde", - "inventory", - "once_cell", - "serde", - "typetag-impl", -] - -[[package]] -name = "typetag-impl" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70b20a22c42c8f1cd23ce5e34f165d4d37038f5b663ad20fb6adbdf029172483" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.90", -] - [[package]] name = "ucd-trie" version = "0.1.7" @@ -7472,12 +7291,6 @@ dependencies = [ "serde", ] -[[package]] -name = "urlencoding" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" - [[package]] name = "urlpattern" version = "0.3.0" diff --git a/Cargo.toml b/Cargo.toml index 3644ef7b..2825a212 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -78,5 +78,4 @@ tokio-rustls = "0.25.0" webpki-roots = "0.26.5" hyper-rustls = { version = "0.25.0", features = ["http2"] } notify = "7.0.0" -pq-sys = { version = "0.6", features = ["bundled"] } -openssl-sys = { version = "0.9.100", features = ["vendored"] } +pq-sys = { version = "0.6" } diff --git a/packages/client/Cargo.toml b/packages/client/Cargo.toml index 15e64147..ea64f2e2 100644 --- a/packages/client/Cargo.toml +++ b/packages/client/Cargo.toml @@ -41,7 +41,6 @@ tauri-plugin-shell = "2.0.0-rc" tauri-plugin-opener = "2.0.0" tauri-plugin-process = "2.0.0-rc" pq-sys = { workspace = true } -openssl-sys = { workspace = true } tauri-plugin-system-info = "2.0.8" tauri-plugin-single-instance = "2.0.0-rc.0" tauri-plugin-updater = "2.0.0-rc.2" diff --git a/packages/codegen/Cargo.toml b/packages/codegen/Cargo.toml index 5b296680..574b5c30 100644 --- a/packages/codegen/Cargo.toml +++ b/packages/codegen/Cargo.toml @@ -11,8 +11,6 @@ edition.workspace = true tonic = { workspace = true } prost = { workspace = true } prost-types = { workspace = true } -prost-wkt = "0.6" -prost-wkt-types = { version = "0.6" } tokio = { workspace = true } serde_json = { workspace = true } serde = { workspace = true } @@ -20,6 +18,5 @@ diesel = { workspace = true } retrom-db = { workspace = true } [build-dependencies] -prost-wkt-build = "0.6" tonic-build = "0.11" walkdir = "2.5.0" diff --git a/packages/db/Cargo.toml b/packages/db/Cargo.toml index 8fbc1245..70160434 100644 --- a/packages/db/Cargo.toml +++ b/packages/db/Cargo.toml @@ -15,7 +15,6 @@ diesel-async = { workspace = true } deadpool = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } -dotenvy = { workspace = true } async-trait = { workspace = true } postgresql_commands = { optional = true, version = "^0.17.3", features = [ "tokio", @@ -26,7 +25,6 @@ postgresql_embedded = { optional = true, version = "^0.17.3", features = [ thiserror = { workspace = true } tracing = { workspace = true } pq-sys = { workspace = true } -openssl-sys = { workspace = true } tokio = { workspace = true } diff --git a/packages/service/Cargo.toml b/packages/service/Cargo.toml index 033a4be5..517375cb 100644 --- a/packages/service/Cargo.toml +++ b/packages/service/Cargo.toml @@ -41,7 +41,6 @@ http-body = "0.4" http = "0.2" warp = "0.3.7" tokio-util = { workspace = true } -tokio-retry = { workspace = true } futures-util = "0.3.30" tokio-stream = { workspace = true } thiserror = { workspace = true } @@ -49,7 +48,7 @@ sanitize-filename = { workspace = true } uuid = { version = "1.10.0", features = ["v4"] } config = { workspace = true } -# opt out of lzma an xz to avoid linking twice (postrgres_embedded and async_zip) +# opt out of lzma and xz to avoid linking twice (postgres_embedded and async_zip) async_zip = { version = "^0.0.17", default-features = false, features = [ "chrono", "tokio-fs", @@ -60,7 +59,6 @@ async_zip = { version = "^0.0.17", default-features = false, features = [ ] } walkdir = "2.5.0" chrono = "0.4.38" -notify = { workspace = true } [features] embedded_db = ["retrom-db/embedded"] diff --git a/plugins/retrom-plugin-installer/Cargo.toml b/plugins/retrom-plugin-installer/Cargo.toml index 378e8460..d8cad3bd 100644 --- a/plugins/retrom-plugin-installer/Cargo.toml +++ b/plugins/retrom-plugin-installer/Cargo.toml @@ -24,7 +24,6 @@ tonic = { workspace = true } tokio-util = { workspace = true } reqwest = { workspace = true } tracing = { workspace = true } -dotenvy = { workspace = true } [build-dependencies] tauri-plugin = { version = "2.0.0-rc", features = ["build"] } diff --git a/plugins/retrom-plugin-launcher/Cargo.toml b/plugins/retrom-plugin-launcher/Cargo.toml index f0c26145..f129bc11 100644 --- a/plugins/retrom-plugin-launcher/Cargo.toml +++ b/plugins/retrom-plugin-launcher/Cargo.toml @@ -15,7 +15,6 @@ tauri = { workspace = true } tokio = { workspace = true } tonic = { workspace = true } serde = { workspace = true } -dotenvy = { workspace = true } thiserror = { workspace = true } tracing = { workspace = true } retrom-codegen = { workspace = true } @@ -23,7 +22,6 @@ retrom-plugin-installer = { workspace = true } retrom-plugin-steam = { workspace = true } retrom-plugin-service-client = { workspace = true } retrom-plugin-config = { workspace = true } -retry = { workspace = true } hyper = { workspace = true } hyper-util = { workspace = true } tower = { workspace = true } diff --git a/plugins/retrom-plugin-standalone/Cargo.toml b/plugins/retrom-plugin-standalone/Cargo.toml index 1f9b4211..b53cafb8 100644 --- a/plugins/retrom-plugin-standalone/Cargo.toml +++ b/plugins/retrom-plugin-standalone/Cargo.toml @@ -19,7 +19,6 @@ retrom-service = { workspace = true, features = ["embedded_db"] } retrom-plugin-config = { workspace = true } serde = { workspace = true } thiserror = { workspace = true } -urlencoding = "2.1.3" local-ip-address = "0.6.3" [build-dependencies] From a40a74b63fa143a9c721c8e0bbe5c0706b1a7faa Mon Sep 17 00:00:00 2001 From: John Beresford Date: Fri, 24 Jan 2025 17:15:16 -0800 Subject: [PATCH 2/2] bump WF dep --- .github/workflows/publish-clients.yml | 6 ++++-- .github/workflows/publish-images.yml | 4 +++- docs | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish-clients.yml b/.github/workflows/publish-clients.yml index a30d6295..ff50e170 100644 --- a/.github/workflows/publish-clients.yml +++ b/.github/workflows/publish-clients.yml @@ -71,6 +71,8 @@ jobs: run: | sudo apt-get update sudo apt-get install -y libpq-dev \ + openssl \ + libssl-dev \ libappindicator3-dev \ librsvg2-dev \ patchelf \ @@ -89,13 +91,13 @@ jobs: - name: install dependencies (macos m1 only) if: matrix.target == '--target aarch64-apple-darwin' # This must match the value defined above. run: | - brew install postgresql@17 + brew install postgresql@17 libpq openssl - name: install dependencies (macos intel only) if: matrix.target == '--target x86_64-apple-darwin' # This must match the value defined above. run: | arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" - arch -x86_64 /usr/local/bin/brew install postgresql@17 + arch -x86_64 /usr/local/bin/brew install postgresql@17 libpq openssl - name: install frontend dependencies run: pnpm install && pnpm exec buf generate diff --git a/.github/workflows/publish-images.yml b/.github/workflows/publish-images.yml index 0ddd6a7e..c71f5c64 100644 --- a/.github/workflows/publish-images.yml +++ b/.github/workflows/publish-images.yml @@ -51,7 +51,9 @@ jobs: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - name: Set up QEMU - uses: docker/setup-qemu-action@v3 + uses: docker/setup-qemu-action@v3.3.0 + with: + image: tonistiigi/binfmt:qemu-v8.1.5 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 diff --git a/docs b/docs index b307024e..7a4d7571 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit b307024e8bceaee2f35c6901d6fd45c74a7b84d3 +Subproject commit 7a4d7571233cac9d9bb22a484b26a55f58744cba