From 449aa67e216dbe0fe2cf1bef6a5d4a3fc4ff5c34 Mon Sep 17 00:00:00 2001
From: Josh Comer <jcomer@cvent.com>
Date: Thu, 22 Feb 2024 16:33:17 -0400
Subject: [PATCH] Fix builds

---
 .github/workflows/ci.yml      | 16 ++++++++--------
 .github/workflows/publish.yml | 12 ++++++------
 Cargo.lock                    |  7 +++----
 Cargo.toml                    |  5 ++++-
 4 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cf036e0..d472ce9 100644
--- 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
index 3734c5c..92244b3 100644
--- 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
index 60f059d..a68b150 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1108,6 +1108,7 @@ dependencies = [
  "anyhow",
  "assert_cmd",
  "bincode",
+ "cc",
  "compression",
  "dir-diff",
  "dogstatsd",
@@ -1861,9 +1862,9 @@ dependencies = [
 
 [[package]]
 name = "redis"
-version = "0.24.0"
+version = "0.23.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c580d9cbbe1d1b479e8d67cf9daf6a62c957e6846048408b80b43ac3f6af84cd"
+checksum = "4f49cdc0bb3f412bf8e7d1bd90fe1d9eb10bc5c399ba90973c14662a27b3f8ba"
 dependencies = [
  "async-trait",
  "bytes",
@@ -1874,8 +1875,6 @@ dependencies = [
  "pin-project-lite",
  "rustls",
  "rustls-native-certs",
- "rustls-pemfile",
- "rustls-webpki",
  "ryu",
  "sha1_smol",
  "socket2 0.4.10",
diff --git a/Cargo.toml b/Cargo.toml
index 19c4aa8..15f0817 100644
--- 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'