Make mysql use the native rust tls stack by default (#144)

tgstation · Jul 22, 2023 · 36e6613 · 36e6613
1 parent 257fea8
commit 36e6613
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 8 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -25,7 +25,7 @@ jobs:
         with:
           toolchain: stable
           command: clippy
-          args: --target i686-pc-windows-msvc --all-features --locked -- -D warnings
+          args: --target i686-pc-windows-msvc --features all --locked -- -D warnings
 
       - name: Rustfmt
         uses: actions-rs/cargo@v1
@@ -39,7 +39,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:
@@ -78,21 +78,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
 
@@ -101,7 +101,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
diff --git 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 }
@@ -69,12 +69,37 @@ default = [
     "json",
     "log",
     "noise",
+    "rustls_tls",
     "sql",
     "time",
     "toml",
     "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"]
 cellularnoise = ["rand", "rayon"]
@@ -108,6 +133,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"]