From 99f38042165437a53ed28ab12a264af9cc40c546 Mon Sep 17 00:00:00 2001
From: Sawyer Blatz <sdblatz@gmail.com>
Date: Tue, 17 Dec 2019 11:31:31 -0600
Subject: [PATCH] Closes #6139: Removes bors (#7247)

I'm sorry, Dave, I'm afraid I can't do that.
---
 .github/PULL_REQUEST_TEMPLATE |  5 ++---
 .taskcluster.yml              | 20 ++++++++------------
 bors.toml                     | 21 ---------------------
 3 files changed, 10 insertions(+), 36 deletions(-)
 delete mode 100644 bors.toml

diff --git a/.github/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE
index 7dd433747..15efd2b3c 100644
--- a/.github/PULL_REQUEST_TEMPLATE
+++ b/.github/PULL_REQUEST_TEMPLATE
@@ -1,5 +1,4 @@
----
-<!-- Text above this line will be added to the commit once "bors" merges this PR -->
+
 
 ### Pull Request checklist
 <!-- Before submitting the PR, please address each item -->
@@ -14,4 +13,4 @@
 1. click on Show All Checks,
 2. click Details next to "Taskcluster (pull_request)" after it appears and then finishes with a green checkmark,
 3. click on the "Fenix - assemble" task, then click "Run Artifacts".
-4. the APK links should be on the left side of the screen, named for each CPU architecture
+4. the APK links should be on the left side of the screen, named for each CPU architecture
\ No newline at end of file
diff --git a/.taskcluster.yml b/.taskcluster.yml
index c6bfcedb6..a0c7f370b 100644
--- a/.taskcluster.yml
+++ b/.taskcluster.yml
@@ -17,19 +17,15 @@ tasks:
                   $if: 'tasks_for in ["cron", "action"]'
                   then: '${tasks_for}@noreply.mozilla.org'
                   else:
-                      $if: 'event.sender.login == "bors[bot]"'
-                      then: 'skaspari+mozlando@mozilla.com'   # It must match what's in bors.toml
+                      $if: 'tasks_for == "github-push"'
+                      then: '${event.pusher.email}'
+                      # Assume Pull Request
                       else:
-                          $if: 'tasks_for == "github-push"'
-                          then: '${event.pusher.email}'
-                          # Assume Pull Request
+                          $if: 'tasks_for == "github-pull-request"'
+                          then: '${event.pull_request.user.login}@users.noreply.github.com'
                           else:
-                              $if: 'tasks_for == "github-pull-request"'
-                              then: '${event.pull_request.user.login}@users.noreply.github.com'
-                              else:
-                                  $if: 'tasks_for == "github-release"'
-                                  then: '${event.sender.login}@users.noreply.github.com'
-
+                              $if: 'tasks_for == "github-release"'
+                              then: '${event.sender.login}@users.noreply.github.com'
               baseRepoUrl:
                   $if: 'tasks_for in ["github-push", "github-release"]'
                   then: '${event.repository.html_url}'
@@ -93,7 +89,7 @@ tasks:
                   else: 'UNDEFINED'
           in:
               $if: 'tasks_for in ["github-pull-request", "action", "cron"]
-              || (tasks_for == "github-push" && head_branch[:10] != "refs/tags/") && (head_branch != "staging.tmp") && (head_branch != "trying.tmp")
+              || (tasks_for == "github-push" && head_branch[:10] != "refs/tags/")
               || (tasks_for == "github-release" && releaseAction == "published")'
               then:
                   $let:
diff --git a/bors.toml b/bors.toml
deleted file mode 100644
index 3e764243a..000000000
--- a/bors.toml
+++ /dev/null
@@ -1,21 +0,0 @@
-status = [
-  "build-debug",
-  "test-debug",
-  "test-ui",
-  "lint-compare-locales",
-  "lint-detekt",
-  "lint-ktlint",
-  "lint-lint"
-]
-block_labels = [
-  "needs:data-review",
-  "do not land",
-  "pr:work-in-progress",
-  "pr:needs-changes"
-]
-required_approvals = 1
-delete_merged_branches = true
-cut_body_after = "---"
-[committer]
-name = "MozLando"
-email = "skaspari+mozlando@mozilla.com"
\ No newline at end of file