From c91adb4a4b20afcfe31a8bbf413a1ccded8aac2b Mon Sep 17 00:00:00 2001
From: "Aode (lion)" <asonix@asonix.dog>
Date: Tue, 28 Dec 2021 10:30:48 -0600
Subject: [PATCH] Rename crate to avoid crates.io collision

---
 .drone.yml | 90 +++++++++++++++++++++++++++++---------------------
 Cargo.lock | 96 +++++++++++++++++++++++++++---------------------------
 Cargo.toml |  6 +++-
 3 files changed, 105 insertions(+), 87 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 9546e45..a486d75 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -28,6 +28,7 @@ trigger:
   event:
   - push
   - pull_request
+  - tag
 
 ---
 
@@ -60,6 +61,7 @@ trigger:
   event:
   - push
   - pull_request
+  - tag
 
 ---
 
@@ -145,6 +147,10 @@ steps:
     files:
     - relay-linux-amd64
 
+depends_on:
+- clippy
+- tests
+
 trigger:
   event:
   - tag
@@ -233,6 +239,10 @@ steps:
     files:
     - relay-linux-arm64v8
 
+depends_on:
+- clippy
+- tests
+
 trigger:
   event:
   - tag
@@ -321,6 +331,10 @@ steps:
     files:
     - relay-linux-arm32v7
 
+depends_on:
+- clippy
+- tests
+
 trigger:
   event:
   - tag
@@ -367,41 +381,41 @@ trigger:
   event:
   - tag
 
-# ---
-# 
-# kind: pipeline
-# type: docker
-# name: publish-crate
-# 
-# platform:
-#   arch: amd64
-# 
-# clone:
-#   disable: true
-# 
-# steps:
-# - name: clone
-#   image: alpine/git:latest
-#   user: root
-#   commands:
-#   - git clone $DRONE_GIT_HTTP_URL .
-#   - git checkout $DRONE_COMMIT
-#   - chown -R 991:991 .
-# 
-# - name: publish
-#   image: asonix/rust-builder:latest-linux-amd64
-#   pull: always
-#   environment:
-#     CRATES_IO_TOKEN:
-#       from_secret: crates_io_token
-#   commands:
-#   - cargo publish --token $CRATES_IO_TOKEN
-# 
-# depends_on:
-# - build-amd64
-# - build-arm64v8
-# - build-arm32v7
-# 
-# trigger:
-#   event:
-#   - tag
+---
+
+kind: pipeline
+type: docker
+name: publish-crate
+
+platform:
+  arch: amd64
+
+clone:
+  disable: true
+
+steps:
+- name: clone
+  image: alpine/git:latest
+  user: root
+  commands:
+  - git clone $DRONE_GIT_HTTP_URL .
+  - git checkout $DRONE_COMMIT
+  - chown -R 991:991 .
+
+- name: publish
+  image: asonix/rust-builder:latest-linux-amd64
+  pull: always
+  environment:
+    CRATES_IO_TOKEN:
+      from_secret: crates_io_token
+  commands:
+  - cargo publish --token $CRATES_IO_TOKEN
+
+depends_on:
+- build-amd64
+- build-arm64v8
+- build-arm32v7
+
+trigger:
+  event:
+  - tag
diff --git a/Cargo.lock b/Cargo.lock
index 4155970..799c696 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -304,6 +304,54 @@ version = "1.0.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "84450d0b4a8bd1ba4144ce8ce718fbc5d071358b1e5384bace6536b3d1f2d5b3"
 
+[[package]]
+name = "ap-relay"
+version = "0.3.11"
+dependencies = [
+ "activitystreams",
+ "activitystreams-ext",
+ "actix-rt",
+ "actix-web",
+ "actix-webfinger",
+ "ammonia",
+ "anyhow",
+ "async-rwlock",
+ "awc",
+ "background-jobs",
+ "base64",
+ "chrono",
+ "config",
+ "console-subscriber",
+ "dashmap",
+ "dotenv",
+ "futures-util",
+ "http-signature-normalization-actix",
+ "lru",
+ "mime",
+ "opentelemetry",
+ "opentelemetry-otlp",
+ "rand 0.8.4",
+ "rsa",
+ "rsa-magic-public-key",
+ "ructe",
+ "serde 1.0.132",
+ "serde_json",
+ "sha2",
+ "sled",
+ "structopt",
+ "thiserror",
+ "toml",
+ "tracing",
+ "tracing-actix-web",
+ "tracing-awc",
+ "tracing-error",
+ "tracing-futures",
+ "tracing-log",
+ "tracing-opentelemetry",
+ "tracing-subscriber",
+ "uuid",
+]
+
 [[package]]
 name = "arrayvec"
 version = "0.5.2"
@@ -2111,54 +2159,6 @@ version = "0.6.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
 
-[[package]]
-name = "relay"
-version = "0.3.11"
-dependencies = [
- "activitystreams",
- "activitystreams-ext",
- "actix-rt",
- "actix-web",
- "actix-webfinger",
- "ammonia",
- "anyhow",
- "async-rwlock",
- "awc",
- "background-jobs",
- "base64",
- "chrono",
- "config",
- "console-subscriber",
- "dashmap",
- "dotenv",
- "futures-util",
- "http-signature-normalization-actix",
- "lru",
- "mime",
- "opentelemetry",
- "opentelemetry-otlp",
- "rand 0.8.4",
- "rsa",
- "rsa-magic-public-key",
- "ructe",
- "serde 1.0.132",
- "serde_json",
- "sha2",
- "sled",
- "structopt",
- "thiserror",
- "toml",
- "tracing",
- "tracing-actix-web",
- "tracing-awc",
- "tracing-error",
- "tracing-futures",
- "tracing-log",
- "tracing-opentelemetry",
- "tracing-subscriber",
- "uuid",
-]
-
 [[package]]
 name = "remove_dir_all"
 version = "0.5.3"
diff --git a/Cargo.toml b/Cargo.toml
index 5eaf43e..6957bfc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "relay"
+name = "ap-relay"
 description = "A simple activitypub relay"
 version = "0.3.11"
 authors = ["asonix <asonix@asonix.dog>"]
@@ -10,6 +10,10 @@ keywords = ["activitypub", "relay"]
 edition = "2021"
 build = "src/build.rs"
 
+[[bin]]
+name = "relay"
+path = "src/main.rs"
+
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]