From 7cdcdb8e0d0a7d667223338b6308221f60b90862 Mon Sep 17 00:00:00 2001 From: Luca Palmieri <20745048+LukeMathWalker@users.noreply.github.com> Date: Sat, 1 Oct 2022 18:07:52 +0100 Subject: [PATCH] Fix CI --- .github/workflows/general.yml | 21 ++++++++++----------- Cargo.lock | 32 ++++++-------------------------- Cargo.toml | 2 +- src/configuration.rs | 16 ++++++++++++---- 4 files changed, 29 insertions(+), 42 deletions(-) diff --git a/.github/workflows/general.yml b/.github/workflows/general.yml index 58aa9f2..e221a82 100644 --- a/.github/workflows/general.yml +++ b/.github/workflows/general.yml @@ -34,7 +34,7 @@ jobs: - 6379:6379 env: SQLX_VERSION: 0.6.2 - SQLX_FEATURES: postgres + SQLX_FEATURES: "rustls,postgres" steps: - name: Checkout repository uses: actions/checkout@v2 @@ -63,9 +63,8 @@ jobs: path: | ~/.cargo/bin/sqlx ~/.cargo/bin/cargo-sqlx - key: ${{ runner.os }}-sqlx-${{ env.SQLX_VERSION }}-${{ env.SQLX_FEATURES }} - - - name: Install sqlx-cli + key: ${{ runner.os }}-sqlx-${{ env.SQLX_VERSION }} + - name: Install sqlx-cli uses: actions-rs/cargo@v1 if: steps.cache-sqlx.outputs.cache-hit == false with: @@ -74,7 +73,7 @@ jobs: sqlx-cli --force --version=${{ env.SQLX_VERSION }} - --features=${{ env.SQLX_FEATURES }} + --features ${{ env.SQLX_FEATURES }} --no-default-features --locked @@ -121,7 +120,7 @@ jobs: - 5432:5432 env: SQLX_VERSION: 0.6.2 - SQLX_FEATURES: postgres + SQLX_FEATURES: "rustls,postgres" steps: - name: Checkout repository uses: actions/checkout@v2 @@ -139,7 +138,7 @@ jobs: with: path: | ~/.cargo/bin/sqlx - key: ${{ runner.os }}-sqlx-${{ env.SQLX_VERSION }}-${{ env.SQLX_FEATURES }} + key: ${{ runner.os }}-sqlx-${{ env.SQLX_VERSION }} - name: Install sqlx-cli uses: actions-rs/cargo@v1 @@ -150,7 +149,7 @@ jobs: sqlx-cli --force --version=${{ env.SQLX_VERSION }} - --features=${{ env.SQLX_FEATURES }} + --features ${{ env.SQLX_FEATURES }} --no-default-features --locked @@ -183,7 +182,7 @@ jobs: - 6379:6379 env: SQLX_VERSION: 0.6.2 - SQLX_FEATURES: postgres + SQLX_FEATURES: "rustls,postgres" steps: - name: Checkout repository uses: actions/checkout@v2 @@ -200,7 +199,7 @@ jobs: with: path: | ~/.cargo/bin/sqlx - key: ${{ runner.os }}-sqlx-${{ env.SQLX_VERSION }}-${{ env.SQLX_FEATURES }} + key: ${{ runner.os }}-sqlx-${{ env.SQLX_VERSION }} - name: Install sqlx-cli uses: actions-rs/cargo@v1 @@ -211,7 +210,7 @@ jobs: sqlx-cli --force --version=${{ env.SQLX_VERSION }} - --features=${{ env.SQLX_FEATURES }} + --features ${{ env.SQLX_FEATURES }} --no-default-features --locked diff --git a/Cargo.lock b/Cargo.lock index 59375e3..8b1b3da 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -157,7 +157,7 @@ dependencies = [ "redis", "serde", "serde_json", - "time 0.3.14", + "time", "tracing", ] @@ -208,7 +208,7 @@ dependencies = [ "serde_urlencoded", "smallvec", "socket2", - "time 0.3.14", + "time", "url", ] @@ -236,7 +236,7 @@ dependencies = [ "serde", "serde_json", "thiserror", - "time 0.3.14", + "time", "tokio", ] @@ -584,11 +584,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" dependencies = [ "iana-time-zone", - "js-sys", "num-integer", "num-traits", - "time 0.1.44", - "wasm-bindgen", "winapi", ] @@ -668,7 +665,7 @@ dependencies = [ "rand 0.8.5", "sha2", "subtle", - "time 0.3.14", + "time", "version_check", ] @@ -684,7 +681,7 @@ dependencies = [ "publicsuffix", "serde", "serde_json", - "time 0.3.14", + "time", "url", ] @@ -2533,17 +2530,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "time" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - [[package]] name = "time" version = "0.3.14" @@ -2706,7 +2692,7 @@ dependencies = [ "log", "serde", "serde_json", - "time 0.3.14", + "time", "tracing", "tracing-core", "tracing-log", @@ -2899,12 +2885,6 @@ version = "0.9.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" diff --git a/Cargo.toml b/Cargo.toml index 2205093..5a83ef2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ serde = "1.0.115" config = { version = "0.13", default-features = false, features = ["yaml"] } sqlx = { version = "0.6", default-features = false, features = ["runtime-actix-rustls", "macros", "postgres", "uuid", "chrono", "migrate", "offline"] } uuid = { version = "1", features = ["v4", "serde"] } -chrono = "0.4.15" +chrono = { version = "0.4.22", default-features = false, features = ["clock"] } reqwest = { version = "0.11", default-features = false, features = ["json", "rustls-tls", "cookies"] } log = "0.4" tracing = "0.1.19" diff --git a/src/configuration.rs b/src/configuration.rs index 9085d71..ff9144e 100644 --- a/src/configuration.rs +++ b/src/configuration.rs @@ -98,13 +98,21 @@ pub fn get_configuration() -> Result { .expect("Failed to parse APP_ENVIRONMENT."); let environment_filename = format!("{}.yaml", environment.as_str()); let settings = config::Config::builder() - .add_source(config::File::from(configuration_directory.join("base.yaml"))) - .add_source(config::File::from(configuration_directory.join(&environment_filename))) + .add_source(config::File::from( + configuration_directory.join("base.yaml"), + )) + .add_source(config::File::from( + configuration_directory.join(&environment_filename), + )) // Add in settings from environment variables (with a prefix of APP and '__' as separator) // E.g. `APP_APPLICATION__PORT=5001 would set `Settings.application.port` - .add_source(config::Environment::with_prefix("APP").prefix_separator("_").separator("__")) + .add_source( + config::Environment::with_prefix("APP") + .prefix_separator("_") + .separator("__"), + ) .build()?; - + settings.try_deserialize::() }