From e9e641a85e5564c35416700b8ea84d55f95fb8f5 Mon Sep 17 00:00:00 2001
From: Jonas Platte <jplatte+git@posteo.de>
Date: Fri, 5 Jun 2020 17:22:48 +0200
Subject: [PATCH] Integrate ruma-signatures

---
 ruma-signatures/.builds/beta.yml    | 27 ------------------------
 ruma-signatures/.builds/nightly.yml | 32 -----------------------------
 ruma-signatures/.builds/stable.yml  | 29 --------------------------
 ruma-signatures/Cargo.toml          |  2 +-
 ruma/Cargo.toml                     |  2 +-
 5 files changed, 2 insertions(+), 90 deletions(-)
 delete mode 100644 ruma-signatures/.builds/beta.yml
 delete mode 100644 ruma-signatures/.builds/nightly.yml
 delete mode 100644 ruma-signatures/.builds/stable.yml

diff --git a/ruma-signatures/.builds/beta.yml b/ruma-signatures/.builds/beta.yml
deleted file mode 100644
index e9349ff7..00000000
--- a/ruma-signatures/.builds/beta.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-image: archlinux
-packages:
-  - rustup
-sources:
-  - https://github.com/ruma/ruma-signatures
-tasks:
-  - rustup: |
-      # We specify --profile minimal because we'd otherwise download docs
-      rustup toolchain install beta --profile minimal -c rustfmt -c clippy
-      rustup default beta
-  - test: |
-      cd ruma-signatures
-
-      # We don't want the build to stop on individual failure of independent
-      # tools, so capture tool exit codes and set the task exit code manually
-      set +e
-
-      cargo fmt -- --check
-      fmt_exit=$?
-
-      cargo clippy --all-targets --all-features -- -D warnings
-      clippy_exit=$?
-
-      cargo test --verbose
-      test_exit=$?
-
-      exit $(( $fmt_exit || $clippy_exit || $test_exit ))
diff --git a/ruma-signatures/.builds/nightly.yml b/ruma-signatures/.builds/nightly.yml
deleted file mode 100644
index f2345792..00000000
--- a/ruma-signatures/.builds/nightly.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-image: archlinux
-packages:
-  - rustup
-sources:
-  - https://github.com/ruma/ruma-signatures
-tasks:
-  - rustup: |
-      rustup toolchain install nightly --profile minimal
-      rustup default nightly
-
-      # Try installing rustfmt & clippy for nightly, but don't fail the build
-      # if they are not available
-      rustup component add rustfmt || true
-      rustup component add clippy || true
-  - test: |
-      cd ruma-signatures
-
-      # We don't want the build to stop on individual failure of independent
-      # tools, so capture tool exit codes and set the task exit code manually
-      set +e
-
-      if ( rustup component list | grep -q rustfmt ); then
-        cargo fmt -- --check
-      fi
-      fmt_exit=$?
-
-      if ( rustup component list | grep -q clippy ); then
-        cargo clippy --all-targets --all-features -- -D warnings
-      fi
-      clippy_exit=$?
-
-      exit $(( $fmt_exit || $clippy_exit ))
diff --git a/ruma-signatures/.builds/stable.yml b/ruma-signatures/.builds/stable.yml
deleted file mode 100644
index 8d0152dc..00000000
--- a/ruma-signatures/.builds/stable.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-image: archlinux
-packages:
-  - rustup
-sources:
-  - https://github.com/ruma/ruma-signatures
-tasks:
-  - rustup: |
-      # We specify --profile minimal because we'd otherwise download docs
-      rustup toolchain install stable --profile minimal -c rustfmt -c clippy
-      rustup default stable
-  - test: |
-      cd ruma-signatures
-
-      # We don't want the build to stop on individual failure of independent
-      # tools, so capture tool exit codes and set the task exit code manually
-      set +e
-
-      cargo fmt -- --check
-      fmt_exit=$?
-
-      cargo clippy --all-targets --all-features -- -D warnings
-      clippy_exit=$?
-
-      cargo test --verbose
-      test_exit=$?
-
-      exit $(( $fmt_exit || $clippy_exit || $test_exit ))
-  # TODO: Add audit task once cargo-audit binary releases are available.
-  #       See https://github.com/RustSec/cargo-audit/issues/66
diff --git a/ruma-signatures/Cargo.toml b/ruma-signatures/Cargo.toml
index 21c7fbb9..a082c32e 100644
--- a/ruma-signatures/Cargo.toml
+++ b/ruma-signatures/Cargo.toml
@@ -4,7 +4,7 @@ categories = ["api-bindings", "cryptography"]
 description = "Digital signatures according to the Matrix specification."
 documentation = "https://docs.rs/ruma-signatures"
 edition = "2018"
-homepage = "https://github.com/ruma/ruma-signatures"
+homepage = "https://www.ruma.io/"
 keywords = ["matrix", "chat", "messaging", "ruma", "cryptography"]
 license = "MIT"
 name = "ruma-signatures"
diff --git a/ruma/Cargo.toml b/ruma/Cargo.toml
index 7a40e0bf..392a8c34 100644
--- a/ruma/Cargo.toml
+++ b/ruma/Cargo.toml
@@ -22,7 +22,7 @@ ruma-common = { version = "0.1.3", path = "../ruma-common" }
 ruma-identifiers = "0.16.2"
 
 ruma-events = { version = "0.21.3", optional = true }
-ruma-signatures = { version = "0.5.0", optional = true }
+ruma-signatures = { version = "0.5.0", path = "../ruma-signatures", optional = true }
 
 ruma-api = { version = "0.16.1", optional = true }
 ruma-appservice-api = { version = "0.1.0", path = "../ruma-appservice-api", optional = true }