Skip to content

Commit

Permalink
GitHub CI: Fix cache keys for multi-platform builds
Browse files Browse the repository at this point in the history
  • Loading branch information
uklotzde committed Jul 31, 2023
1 parent 707a535 commit 4c77108
Show file tree
Hide file tree
Showing 13 changed files with 59 additions and 50 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/build-and-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: >-
Expand Down
78 changes: 44 additions & 34 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion crates/backend-embedded/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion crates/backend-webapi-json/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion crates/client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion crates/core-api-json/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions crates/core-json/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions crates/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"] }
Expand Down
2 changes: 1 addition & 1 deletion crates/desktop-app/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down
2 changes: 1 addition & 1 deletion crates/media-file/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion crates/storage-sqlite/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion crates/websrv-warp-sqlite/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }

Expand Down
4 changes: 2 additions & 2 deletions websrv/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 4c77108

Please sign in to comment.