Merge pull request #1728 from kate-goldenring/use-default-flate2

Use default `flate2` backend
fermyon · Aug 31, 2023 · 7f84a95 · 7f84a95
2 parents 2617020 + 1a4599a
commit 7f84a95
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 30 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/outbound-mysql/Cargo.toml b/crates/outbound-mysql/Cargo.toml
@@ -9,9 +9,11 @@ doctest = false
 
 [dependencies]
 anyhow = "1.0"
-mysql_async = { version = "0.30.0", default-features = false }
-flate2 = { version = "1.0.17", features = ["zlib-ng"], default-features = false }
-mysql_common = { version = "0.29.1", default-features = false }
+flate2 = "1.0.17"
+# Removing default features for mysql_async to remove flate2/zlib feature
+mysql_async = { version = "0.32.2", default-features = false, features = ["native-tls-tls"] }
+# Removing default features for mysql_common to remove flate2/zlib feature
+mysql_common = { version = "0.30.6", default-features = false }
 spin-core = { path = "../core" }
 spin-world = { path = "../world" }
 tokio = { version = "1", features = [ "rt-multi-thread" ] }

diff --git a/crates/plugins/Cargo.toml b/crates/plugins/Cargo.toml
@@ -10,7 +10,7 @@ bytes = "1.1"
 chrono = { version = "0.4", features = ["serde"] }
 dirs = "4.0"
 fd-lock = "3.0.12"
-flate2 = { version = "1.0.17", features = ["zlib-ng"], default-features = false }
+flate2 = "1.0.17"
 is-terminal = "0.4"
 path-absolutize = "3.0.11"
 reqwest = { version = "0.11", features = ["json"] }

diff --git a/e2e-tests-aarch64.Dockerfile b/e2e-tests-aarch64.Dockerfile
@@ -4,7 +4,7 @@ ARG BUILD_SPIN=false
 ARG SPIN_VERSION=canary
 
 WORKDIR /root
-RUN apt-get update && apt-get install -y wget sudo xz-utils gcc git pkg-config redis clang libicu-dev docker.io cmake
+RUN apt-get update && apt-get install -y wget sudo xz-utils gcc git pkg-config redis clang libicu-dev docker.io
 
 # nodejs
 RUN curl -fsSL https://deb.nodesource.com/setup_16.x | sudo -E bash -

diff --git a/e2e-tests.Dockerfile b/e2e-tests.Dockerfile
@@ -5,7 +5,7 @@ ARG FETCH_SPIN=true
 ARG SPIN_VERSION=canary
 
 WORKDIR /root
-RUN apt-get update && apt-get install -y wget sudo xz-utils gcc git pkg-config redis clang libicu-dev docker.io cmake
+RUN apt-get update && apt-get install -y wget sudo xz-utils gcc git pkg-config redis clang libicu-dev docker.io
 
 # nodejs
 RUN curl -fsSL https://deb.nodesource.com/setup_16.x | sudo -E bash -