diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index ebe476e4..abd3b36b 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -27,7 +27,7 @@ jobs: with: toolchain: stable command: clippy - args: --target i686-pc-windows-msvc --all-features --locked + args: --target i686-pc-windows-msvc --features all --locked -- -D warnings - name: Rustfmt uses: actions-rs/cargo@v1 @@ -41,7 +41,7 @@ jobs: with: toolchain: stable command: build - args: --target i686-pc-windows-msvc --release + args: --target i686-pc-windows-msvc --locked --release - uses: actions/upload-artifact@v3 with: @@ -79,21 +79,21 @@ jobs: with: toolchain: stable command: check - args: --target i686-unknown-linux-gnu --all-features + args: --target i686-unknown-linux-gnu --locked --features all - name: Build (Debug) (all features) uses: actions-rs/cargo@v1 with: toolchain: stable command: build - args: --target i686-unknown-linux-gnu --all-features + args: --target i686-unknown-linux-gnu --locked --features all - name: Run tests (all features) uses: actions-rs/cargo@v1 with: toolchain: stable command: test - args: --target i686-unknown-linux-gnu --all-features + args: --target i686-unknown-linux-gnu --locked --features all env: BYOND_BIN: /home/runner/BYOND/byond/bin @@ -102,7 +102,7 @@ jobs: with: toolchain: stable command: build - args: --target i686-unknown-linux-gnu --release + args: --target i686-unknown-linux-gnu --locked --release - uses: actions/upload-artifact@v3 with: diff --git a/Cargo.lock b/Cargo.lock index 4ada646d..222a3eef 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1448,11 +1448,15 @@ dependencies = [ "once_cell", "pem", "percent-encoding", + "rustls", + "rustls-pemfile", "serde", "serde_json", "socket2 0.5.3", "twox-hash", "url", + "webpki", + "webpki-roots 0.23.1", ] [[package]] @@ -2150,7 +2154,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots", + "webpki-roots 0.22.6", "winreg", ] @@ -3002,6 +3006,15 @@ dependencies = [ "webpki", ] +[[package]] +name = "webpki-roots" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" +dependencies = [ + "rustls-webpki", +] + [[package]] name = "winapi" version = "0.3.9" diff --git a/Cargo.toml b/Cargo.toml index 81c1b3b5..cb426449 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,7 +46,7 @@ serde = { version = "1.0", optional = true, features = ["derive"] } serde_json = { version = "1.0", optional = true } lazy_static = { version = "1.4", optional = true } once_cell = { version = "1.17", optional = true } -mysql = { version = "24.0", optional = true } +mysql = { version = "24.0", default_features = false, optional = true} dashmap = { version = "5.4", optional = true } zip = { version = "0.6", optional = true } rand = { version = "0.8", optional = true } @@ -76,6 +76,7 @@ default = [ "json", "log", "noise", + "rustls_tls", "sql", "time", "toml", @@ -84,6 +85,30 @@ default = [ "url", ] +all = [ + "acreplace", + "cellularnoise", + "dmi", + "file", + "git", + "http", + "json", + "log", + "noise", + "rustls_tls", + "sql", + "time", + "toml", + "url", + "batchnoise", + "hash", + "pathfinder", + "redis_pubsub", + "redis_reliablequeue", + "unzip", + "worleynoise" +] + # default features acreplace = ["aho-corasick"] auroranoise = ["fast_poisson"] @@ -119,6 +144,10 @@ redis_reliablequeue = ["flume", "redis", "serde", "serde_json"] unzip = ["zip", "jobs"] worleynoise = ["rand", "rayon"] +# Use the native tls stack for the mysql db +native_tls = ["mysql/default"] +rustls_tls = ["mysql/default-rustls"] + # internal feature-like things jobs = ["flume"]