From 2215bd726b11859a8e8f1477f99aa1576ade2f97 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 | 18 +++++++++--------- Cargo.lock | 30 +++++------------------------- Cargo.toml | 2 +- src/configuration.rs | 5 ++++- 4 files changed, 19 insertions(+), 36 deletions(-) diff --git a/.github/workflows/general.yml b/.github/workflows/general.yml index 8cb035f..e690cbc 100644 --- a/.github/workflows/general.yml +++ b/.github/workflows/general.yml @@ -30,7 +30,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 @@ -56,7 +56,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 @@ -67,7 +67,7 @@ jobs: sqlx-cli --force --version=${{ env.SQLX_VERSION }} - --features=${{ env.SQLX_FEATURES }} + --features ${{ env.SQLX_FEATURES }} --no-default-features --locked @@ -110,7 +110,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 @@ -128,7 +128,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 @@ -139,7 +139,7 @@ jobs: sqlx-cli --force --version=${{ env.SQLX_VERSION }} - --features=${{ env.SQLX_FEATURES }} + --features ${{ env.SQLX_FEATURES }} --no-default-features --locked @@ -168,7 +168,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 @@ -185,7 +185,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 @@ -196,7 +196,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 7be8264..22ecf35 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -165,7 +165,7 @@ dependencies = [ "serde_urlencoded", "smallvec", "socket2", - "time 0.3.14", + "time", "url", ] @@ -357,11 +357,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", ] @@ -392,7 +389,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "344adc371239ef32293cb1c4fe519592fcf21206c79c02854320afcdf3ab4917" dependencies = [ "percent-encoding", - "time 0.3.14", + "time", "version_check", ] @@ -677,7 +674,7 @@ checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" dependencies = [ "cfg-if", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", ] [[package]] @@ -1025,7 +1022,7 @@ checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf" dependencies = [ "libc", "log", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "windows-sys", ] @@ -1802,17 +1799,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" @@ -1975,7 +1961,7 @@ dependencies = [ "log", "serde", "serde_json", - "time 0.3.14", + "time", "tracing", "tracing-core", "tracing-log", @@ -2120,12 +2106,6 @@ dependencies = [ "try-lock", ] -[[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 127efbe..6e56b7b 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"] } uuid = { version = "1", features = ["v4"] } -chrono = "0.4.15" +chrono = { version = "0.4.22", default-features = false, features = ["clock"] } tracing = "0.1.19" tracing-subscriber = { version = "0.3", features = ["registry", "env-filter"] } tracing-bunyan-formatter = "0.3.1" diff --git a/src/configuration.rs b/src/configuration.rs index 328f1ea..42467c8 100644 --- a/src/configuration.rs +++ b/src/configuration.rs @@ -40,7 +40,10 @@ impl DatabaseSettings { pub fn get_configuration() -> Result { let settings = config::Config::builder() - .add_source(config::File::new("configuration.yaml", config::FileFormat::Yaml)) + .add_source(config::File::new( + "configuration.yaml", + config::FileFormat::Yaml, + )) .build()?; settings.try_deserialize::() }