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

itsmeowForks · Dec 28, 2023 · db877ce · db877ce
1 parent 613d8d5
commit db877ce
Show file tree

Hide file tree

Showing 3 changed files with 70 additions and 16 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -19,10 +19,11 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           toolchain: stable
-          command: build
-          args: --target i686-pc-windows-msvc --release --all-features
-      - name: Upload artifact (all features)
-        uses: actions/upload-artifact@v1
+          command: clippy
+          args: --target i686-pc-windows-msvc --features all --locked -- -D warnings
+
+      - name: Rustfmt
+        uses: actions-rs/cargo@v1
         with:
           name: full_rust_g.dll
           path: target/i686-pc-windows-msvc/release/rust_g.dll
@@ -31,9 +32,9 @@ jobs:
         with:
           toolchain: stable
           command: build
-          args: --target i686-pc-windows-msvc --release
-      - name: Upload artifact (release)
-        uses: actions/upload-artifact@v1
+          args: --target i686-pc-windows-msvc --locked --release
+
+      - uses: actions/upload-artifact@v3
         with:
           name: rust_g.dll
           path: target/i686-pc-windows-msvc/release/rust_g.dll
@@ -54,18 +55,29 @@ jobs:
         with:
           toolchain: stable
           target: i686-unknown-linux-gnu
-      - name: Build (Debug)
+
+      - uses: Swatinem/rust-cache@v2
+
+      - name: Check (all features)
+        uses: actions-rs/cargo@v1
+        with:
+          toolchain: stable
+          command: check
+          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
-      - name: Run tests
+          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
+          args: --target i686-unknown-linux-gnu --locked --features all
         env:
           BYOND_BIN: /home/runner/BYOND/byond/bin
       - name: Build (all features)
@@ -84,9 +96,9 @@ jobs:
         with:
           toolchain: stable
           command: build
-          args: --target i686-unknown-linux-gnu --release
-      - name: Upload artifact (release)
-        uses: actions/upload-artifact@v1
+          args: --target i686-unknown-linux-gnu --locked --release
+
+      - uses: actions/upload-artifact@v3
         with:
           name: librust_g.so
           path: target/i686-unknown-linux-gnu/release/librust_g.so
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"]