Merge pull request #84 from jjcomer/add-redis-tls

Fix builds
cvent · Feb 22, 2024 · 1a88001 · 1a88001
2 parents 2fad4b3 + 449aa67
commit 1a88001
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 19 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,14 +22,14 @@ jobs:
           # - i686-pc-windows-gnu
           - i686-pc-windows-msvc
           - i686-unknown-linux-gnu
-          # - x86_64-apple-darwin
+          - x86_64-apple-darwin
           # Windows gnu is not currently working
           # - x86_64-pc-windows-gnu
           - x86_64-pc-windows-msvc
           - x86_64-unknown-linux-gnu
           # Select tier 2 platforms
           # https://doc.rust-lang.org/nightly/rustc/platform-support.html#tier-2-with-host-tools
-          # - aarch64-apple-darwin
+          - aarch64-apple-darwin
           # Windows ARM is not currently working
           # - aarch64-pc-windows-msvc
           - x86_64-unknown-linux-musl
@@ -47,9 +47,9 @@ jobs:
           - target: i686-unknown-linux-gnu
             os: ubuntu-latest
             testable: true
-          # - target: x86_64-apple-darwin
-          #   os: macos-latest
-          #   testable: true
+          - target: x86_64-apple-darwin
+            os: macos-latest
+            testable: true
           # - target: x86_64-pc-windows-gnu
           #   os: windows-latest
           #   testable: true
@@ -59,9 +59,9 @@ jobs:
           - target: x86_64-unknown-linux-gnu
             os: ubuntu-latest
             testable: true
-          # - target: aarch64-apple-darwin
-          #   os: macos-latest
-          #   testable: false
+          - target: aarch64-apple-darwin
+            os: macos-latest
+            testable: false
           # - target: aarch64-pc-windows-msvc
           #   os: windows-latest
           #   testable: false

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -28,14 +28,14 @@ jobs:
           # - i686-pc-windows-gnu
           - i686-pc-windows-msvc
           - i686-unknown-linux-gnu
-          # - x86_64-apple-darwin
+           - x86_64-apple-darwin
           # Windows gnu is not currently working
           # - x86_64-pc-windows-gnu
           - x86_64-pc-windows-msvc
           - x86_64-unknown-linux-gnu
           # Select tier 2 platforms
           # https://doc.rust-lang.org/nightly/rustc/platform-support.html#tier-2-with-host-tools
-          # - aarch64-apple-darwin
+          - aarch64-apple-darwin
           # Windows ARM is not currently working
           # - aarch64-pc-windows-msvc
           - x86_64-unknown-linux-musl
@@ -48,16 +48,16 @@ jobs:
             os: windows-latest
           - target: i686-unknown-linux-gnu
             os: ubuntu-latest
-          # - target: x86_64-apple-darwin
-          #   os: macos-latest
+          - target: x86_64-apple-darwin
+            os: macos-latest
           # - target: x86_64-pc-windows-gnu
           #   os: windows-latest
           - target: x86_64-pc-windows-msvc
             os: windows-latest
           - target: x86_64-unknown-linux-gnu
             os: ubuntu-latest
-          # - target: aarch64-apple-darwin
-          #   os: macos-latest
+          - target: aarch64-apple-darwin
+            os: macos-latest
           # - target: aarch64-pc-windows-msvc
           #   os: windows-latest
           - target: x86_64-unknown-linux-musl

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,6 +12,9 @@ authors = [
 ]
 edition = '2021'
 
+[build-dependencies.cc]
+version = "1.0.86"
+
 [dependencies]
 actix-web = '4.4'
 anyhow = '1.0'
@@ -27,7 +30,7 @@ log = '0.4'
 lru_time_cache = '0.11'
 lru = '0.12'
 parking_lot = '0.12'
-redis = { version = "0.24.0", features = ["tokio-rustls-comp"] }
+redis = { version = "0.23", features = ["tokio-rustls-comp"] }
 riker = '0.4'
 riker-patterns = '0.4'
 serde_derive = '1.0'