diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4e4a9490..d0bf0d9e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -129,9 +129,9 @@ artifacts: .push-oci-image: stage: publish - image: docker:26.0.1 + image: docker:26.0.2 services: - - docker:26.0.1-dind + - docker:26.0.2-dind variables: IMAGE_SUFFIX_AMD64: amd64 IMAGE_SUFFIX_ARM64V8: arm64v8 diff --git a/Cargo.lock b/Cargo.lock index e0841e44..115bf815 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -399,12 +399,13 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.94" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7" +checksum = "d32a725bc159af97c3e629873bb9f88fb8cf8a4867175f76dc987815ea07c83b" dependencies = [ "jobserver", "libc", + "once_cell", ] [[package]] @@ -2995,9 +2996,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -3164,18 +3165,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 84976146..fcfbebc2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ rust-version = "1.75.0" rand = "0.8.5" # Used for conduit::Error type -thiserror = "1.0.58" +thiserror = "1.0.59" # Used to encode server public key base64 = "0.22.0" @@ -105,7 +105,14 @@ features = ["util"] [dependencies.tower-http] version = "0.5.2" -features = ["add-extension", "cors", "sensitive-headers", "trace", "util", "catch-panic"] +features = [ + "add-extension", + "cors", + "sensitive-headers", + "trace", + "util", + "catch-panic", +] [dependencies.hyper] version = "1.3.1" @@ -122,7 +129,7 @@ features = ["rustls-tls-native-roots", "socks", "hickory-dns"] # all the serde stuff # Used for pdu definition [dependencies.serde] -version = "1.0.197" +version = "1.0.198" features = ["rc"] # Used for appservice registration files [dependencies.serde_yaml] @@ -245,7 +252,7 @@ default-features = false # Used for reading the configuration from conduit.toml & environment variables [dependencies.figment] -version = "0.10.17" +version = "0.10.18" features = ["env", "toml"] # Used for matrix spec type definitions and helpers