From 4c7710808ab199b60d57c1b7876c2cc7414bdc26 Mon Sep 17 00:00:00 2001 From: Uwe Klotz Date: Mon, 31 Jul 2023 20:17:19 +0200 Subject: [PATCH] GitHub CI: Fix cache keys for multi-platform builds --- .github/workflows/build-and-test.yaml | 3 +- Cargo.lock | 78 +++++++++++++++------------ crates/backend-embedded/Cargo.toml | 2 +- crates/backend-webapi-json/Cargo.toml | 2 +- crates/client/Cargo.toml | 2 +- crates/core-api-json/Cargo.toml | 2 +- crates/core-json/Cargo.toml | 4 +- crates/core/Cargo.toml | 4 +- crates/desktop-app/Cargo.toml | 2 +- crates/media-file/Cargo.toml | 2 +- crates/storage-sqlite/Cargo.toml | 2 +- crates/websrv-warp-sqlite/Cargo.toml | 2 +- websrv/Cargo.toml | 4 +- 13 files changed, 59 insertions(+), 50 deletions(-) diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml index d43514e3..2e62cea7 100644 --- a/.github/workflows/build-and-test.yaml +++ b/.github/workflows/build-and-test.yaml @@ -84,9 +84,8 @@ jobs: uses: Swatinem/rust-cache@v2 with: # The cache should not be shared between different workflows and jobs. - shared-key: ${{ github.workflow }}-${{ github.job }} # Two jobs might share the same default target but have different build targets. - key: ${{ matrix.target }} + shared-key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.target }} - name: Check aoide-core run: >- diff --git a/Cargo.lock b/Cargo.lock index 2466bf8c..0e564572 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -55,9 +55,9 @@ dependencies = [ [[package]] name = "android-activity" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40bc1575e653f158cbdc6ebcd917b9564e66321c5325c232c3591269c257be69" +checksum = "64529721f27c2314ced0890ce45e469574a73e5e6fdd6e9da1860eb29285f5e0" dependencies = [ "android-properties", "bitflags 1.3.2", @@ -668,7 +668,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.28", ] [[package]] @@ -711,7 +711,7 @@ checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.28", ] [[package]] @@ -883,7 +883,7 @@ checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.28", ] [[package]] @@ -1224,6 +1224,15 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41b319d1b62ffbd002e057f36bebd1f42b9f97927c9577461d855f3513c4289f" +[[package]] +name = "deranged" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8810e7e2cf385b1e9b50d68264908ec367ba642c96d02edfe61c39e88e2a3c01" +dependencies = [ + "serde", +] + [[package]] name = "derivative" version = "2.2.0" @@ -1260,7 +1269,7 @@ dependencies = [ "diesel_table_macro_syntax", "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.28", ] [[package]] @@ -1280,7 +1289,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc5557efc453706fed5e4fa85006fe9817c224c3f480a34c7e5959fd700921c5" dependencies = [ - "syn 2.0.27", + "syn 2.0.28", ] [[package]] @@ -1480,7 +1489,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.28", ] [[package]] @@ -1521,9 +1530,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" dependencies = [ "errno-dragonfly", "libc", @@ -1735,7 +1744,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.28", ] [[package]] @@ -2415,7 +2424,7 @@ checksum = "764b60e1ddd07e5665a6a17636a95cd7d8f3b86c73503a69c32979d05f72f3cf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.28", ] [[package]] @@ -2804,7 +2813,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.28", ] [[package]] @@ -3017,7 +3026,7 @@ checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.28", ] [[package]] @@ -3539,22 +3548,22 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.178" +version = "1.0.179" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60363bdd39a7be0266a520dab25fdc9241d2f987b08a01e01f0ec6d06a981348" +checksum = "0a5bf42b8d227d4abf38a1ddb08602e229108a517cd4e5bb28f9c7eaafdce5c0" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.178" +version = "1.0.179" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28482318d6641454cb273da158647922d1be6b5a2fcc6165cd89ebdd7ed576b" +checksum = "741e124f5485c7e60c03b043f79f320bff3527f4bbf12cf3831750dc46a0ec2c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.28", ] [[package]] @@ -3587,7 +3596,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.28", ] [[package]] @@ -3792,7 +3801,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.27", + "syn 2.0.28", ] [[package]] @@ -3814,9 +3823,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.27" +version = "2.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" +checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" dependencies = [ "proc-macro2", "quote", @@ -4016,7 +4025,7 @@ checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.28", ] [[package]] @@ -4042,10 +4051,11 @@ dependencies = [ [[package]] name = "time" -version = "0.3.23" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" +checksum = "b79eabcd964882a646b3584543ccabeae7869e9ac32a46f6f22b7a5bd405308b" dependencies = [ + "deranged", "itoa", "js-sys", "libc", @@ -4063,9 +4073,9 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4" +checksum = "eb71511c991639bb078fd5bf97757e03914361c48100d52878b8e52b46fb92cd" dependencies = [ "time-core", ] @@ -4137,7 +4147,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.28", ] [[package]] @@ -4236,7 +4246,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.28", ] [[package]] @@ -4520,7 +4530,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.28", "wasm-bindgen-shared", ] @@ -4554,7 +4564,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.28", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4929,9 +4939,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25b5872fa2e10bd067ae946f927e726d7d603eaeb6e02fa6a350e0722d2b8c11" +checksum = "8bd122eb777186e60c3fdf765a58ac76e41c582f1f535fbf3314434c6b58f3f7" dependencies = [ "memchr", ] diff --git a/crates/backend-embedded/Cargo.toml b/crates/backend-embedded/Cargo.toml index a722d5c8..3a26aa35 100644 --- a/crates/backend-embedded/Cargo.toml +++ b/crates/backend-embedded/Cargo.toml @@ -14,7 +14,7 @@ rust-version = { workspace = true } anyhow = "1.0.72" diesel = { version = "2.1.0", default-features = false, features = ["sqlite"] } log = "0.4.19" -serde = { version = "1.0.178", features = ["derive"] } +serde = { version = "1.0.179", features = ["derive"] } thiserror = "1.0.44" # Workspace dependencies diff --git a/crates/backend-webapi-json/Cargo.toml b/crates/backend-webapi-json/Cargo.toml index b42eefad..e6e70157 100644 --- a/crates/backend-webapi-json/Cargo.toml +++ b/crates/backend-webapi-json/Cargo.toml @@ -15,7 +15,7 @@ anyhow = "1.0.72" diesel = { version = "2.1.0", default-features = false, features = ["sqlite"] } log = "0.4.19" nonicle = "0.1.0" -serde = { version = "1.0.178" } +serde = { version = "1.0.179" } thiserror = "1.0.44" url = "2.4.0" diff --git a/crates/client/Cargo.toml b/crates/client/Cargo.toml index dd8a20fc..5fb085bb 100644 --- a/crates/client/Cargo.toml +++ b/crates/client/Cargo.toml @@ -17,7 +17,7 @@ bytes = "1.4.0" infect = "0.0.29" #infect = { git = "https://github.com/uklotzde/infect.git" } log = "0.4.19" -serde = { version = "1.0.178", features = ["derive"], optional = true } +serde = { version = "1.0.179", features = ["derive"], optional = true } serde_json = "1.0.104" serde_urlencoded = "0.7.1" static_assertions = "1.1.0" diff --git a/crates/core-api-json/Cargo.toml b/crates/core-api-json/Cargo.toml index 20b2bfad..d3b840f2 100644 --- a/crates/core-api-json/Cargo.toml +++ b/crates/core-api-json/Cargo.toml @@ -12,7 +12,7 @@ rust-version = { workspace = true } [dependencies] anyhow = "1.0.72" -serde = { version = "1.0.178", features = ["derive"] } +serde = { version = "1.0.179", features = ["derive"] } url = { version = "2.4.0", features = ["serde"] } # JSON Schema (optional) diff --git a/crates/core-json/Cargo.toml b/crates/core-json/Cargo.toml index 062d4074..3f61b8d7 100644 --- a/crates/core-json/Cargo.toml +++ b/crates/core-json/Cargo.toml @@ -14,9 +14,9 @@ rust-version = { workspace = true } anyhow = "1.0.72" base64 = "0.21.2" mime = "0.3.17" -serde = { version = "1.0.178", features = ["derive"] } +serde = { version = "1.0.179", features = ["derive"] } serde_repr = "0.1.16" -time = { version = "0.3.23", features = ["serde-human-readable"] } +time = { version = "0.3.24", features = ["serde-human-readable"] } url = { version = "2.4.0", features = ["serde"] } # JSON Schema (optional) diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml index a531d9ea..80882165 100644 --- a/crates/core/Cargo.toml +++ b/crates/core/Cargo.toml @@ -20,7 +20,7 @@ nonicle = "0.1.0" rand = "0.8.5" semval = "0.5.0" strum = { version = "0.25.0", features = ["derive"] } -time = { version = "0.3.23", features = [ +time = { version = "0.3.24", features = [ "macros", "local-offset", "parsing", @@ -31,7 +31,7 @@ ulid = "1.0.0" url = "2.4.0" # Serialization of selected, primitive types -serde = { version = "1.0.178", optional = true, features = ["derive"] } +serde = { version = "1.0.179", optional = true, features = ["derive"] } # JSON Schema (optional) schemars = { version = "0.8.12", optional = true, features = ["url"] } diff --git a/crates/desktop-app/Cargo.toml b/crates/desktop-app/Cargo.toml index 9e84ec20..11e680f2 100644 --- a/crates/desktop-app/Cargo.toml +++ b/crates/desktop-app/Cargo.toml @@ -17,7 +17,7 @@ highway = { version = "1.1.0" } log = "0.4.19" rfd = { version = "0.11.4", default-features = false, features = ["xdg-portal"] } ron = "0.8.0" -serde = { version = "1.0.178", features = ["derive"] } +serde = { version = "1.0.179", features = ["derive"] } tokio = { version = "1.29.1", default-features = false } unnest = "0.3.1" url = { version = "2.4.0", features = ["serde"] } diff --git a/crates/media-file/Cargo.toml b/crates/media-file/Cargo.toml index e6e5b24a..ae8dd6b2 100644 --- a/crates/media-file/Cargo.toml +++ b/crates/media-file/Cargo.toml @@ -27,7 +27,7 @@ mime_guess = "2.0.4" nom = "7.1.3" num-traits = "0.2.16" thiserror = "1.0.44" -time = { version = "0.3.23", features = ["parsing"] } +time = { version = "0.3.24", features = ["parsing"] } url = "2.4.0" walkdir = "2.3.3" diff --git a/crates/storage-sqlite/Cargo.toml b/crates/storage-sqlite/Cargo.toml index d9119146..b2a22dda 100644 --- a/crates/storage-sqlite/Cargo.toml +++ b/crates/storage-sqlite/Cargo.toml @@ -18,7 +18,7 @@ r2d2 = "0.8.10" thiserror = "1.0.44" # Feature "serde" -serde = { version = "1.0.178", optional = true, features = ["derive"] } +serde = { version = "1.0.179", optional = true, features = ["derive"] } # Feature "sqlite-bundled" # Bundle SQLite code to prevent dynamic linking. diff --git a/crates/websrv-warp-sqlite/Cargo.toml b/crates/websrv-warp-sqlite/Cargo.toml index 71542174..30b64421 100644 --- a/crates/websrv-warp-sqlite/Cargo.toml +++ b/crates/websrv-warp-sqlite/Cargo.toml @@ -14,7 +14,7 @@ publish = false [dependencies] anyhow = "1.0.72" log = "0.4.19" -serde = "1.0.178" +serde = "1.0.179" thiserror = "1.0.44" warp = { version = "0.3.5", default-features = false } diff --git a/websrv/Cargo.toml b/websrv/Cargo.toml index ccaa8562..0a423182 100644 --- a/websrv/Cargo.toml +++ b/websrv/Cargo.toml @@ -20,10 +20,10 @@ dotenvy = "0.15.7" log = { version = "0.4.19", features = ["release_max_level_debug"] } parking_lot = "0.12.1" ron = "0.8.0" -serde = { version = "1.0.178", features = ["derive"] } +serde = { version = "1.0.179", features = ["derive"] } serde_json = "1.0.104" thiserror = "1.0.44" -time = { version = "0.3.23", features = ["serde-human-readable"] } +time = { version = "0.3.24", features = ["serde-human-readable"] } tokio = { version = "1.29.1", default-features = false, features = [ "rt-multi-thread", "signal",