From df42ef68a2843ce03e276bb77075161886ae55b1 Mon Sep 17 00:00:00 2001
From: Johannes Becker <j.becker@famedly.com>
Date: Wed, 9 Jun 2021 22:14:41 +0200
Subject: [PATCH] appservice: Enable warp by default
---
.github/workflows/ci.yml | 4 ++--
matrix_sdk_appservice/Cargo.toml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index edc60168..63ca9edd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -101,11 +101,11 @@ jobs:
include:
- name: linux / appservice / stable / actix
- cargo_args: --features actix
+ cargo_args: --no-default-features --features actix
- name: macOS / appservice / stable / actix
os: macOS-latest
- cargo_args: --features actix
+ cargo_args: --no-default-features --features actix
- name: linux / appservice / stable / warp
cargo_args: --features warp
diff --git a/matrix_sdk_appservice/Cargo.toml b/matrix_sdk_appservice/Cargo.toml
index 143b1afb..a6a91f0a 100644
--- a/matrix_sdk_appservice/Cargo.toml
+++ b/matrix_sdk_appservice/Cargo.toml
@@ -8,7 +8,7 @@ name = "matrix-sdk-appservice"
version = "0.1.0"
[features]
-default = []
+default = ["warp"]
actix = ["actix-rt", "actix-web"]
docs = ["actix", "warp"]
@@ -27,7 +27,7 @@ serde_yaml = "0.8"
thiserror = "1.0"
tracing = "0.1"
url = "2"
-warp = { git = "https://github.com/seanmonstar/warp.git", rev = "629405", optional = true, default-features = false, features = ["multipart", "websocket"] }
+warp = { git = "https://github.com/seanmonstar/warp.git", rev = "629405", optional = true, default-features = false }
matrix-sdk = { version = "0.2", path = "../matrix_sdk", default-features = false, features = ["appservice", "native-tls"] }