From 6f658f5aae652b64a2ff77ba302268c4b404941f Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Tue, 28 Nov 2023 14:03:32 +0000
Subject: [PATCH] Remove mandatory backport checks (#78678)

* Remove mandatory backport checks

* update backporting docs
---
 .github/pr-checks.json                     | 19 -------------------
 .github/renovate.json5                     |  2 +-
 .github/workflows/alerting-swagger-gen.yml |  2 +-
 contribute/merge-pull-request.md           | 19 +++----------------
 crowdin.yml                                |  1 -
 5 files changed, 5 insertions(+), 38 deletions(-)

diff --git a/.github/pr-checks.json b/.github/pr-checks.json
index fec10a1201d..b97dbc137ec 100644
--- a/.github/pr-checks.json
+++ b/.github/pr-checks.json
@@ -6,25 +6,6 @@
     "success": "Milestone set",
     "failure": "Milestone not set"
   },
-  {
-    "type": "check-label",
-    "title": "Backport Check",
-    "labels": {
-      "exists": "Backport enabled",
-      "notExists": "Backport decision needed",
-      "matches": [
-        "backport v*"
-      ]
-    },
-    "skip": {
-      "message": "Backport skipped",
-      "matches": [
-        "backport",
-        "no-backport"
-      ]
-    },
-    "targetUrl": "https://github.com/grafana/grafana/blob/main/contribute/merge-pull-request.md#should-the-pull-request-be-backported"
-  },
   {
     "type": "check-changelog",
     "title": "Changelog Check",
diff --git a/.github/renovate.json5 b/.github/renovate.json5
index e8f9da4aba2..331453813b3 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -11,7 +11,7 @@
   ],
   "includePaths": ["package.json", "packages/**", "public/app/plugins/**"],
   "ignorePaths": ["emails/**", "plugins-bundled/**", "**/mocks/**", "packages/grafana-e2e/**"],
-  "labels": ["area/frontend", "dependencies", "no-backport", "no-changelog"],
+  "labels": ["area/frontend", "dependencies", "no-changelog"],
   "postUpdateOptions": ["yarnDedupeHighest"],
   "packageRules": [
     {
diff --git a/.github/workflows/alerting-swagger-gen.yml b/.github/workflows/alerting-swagger-gen.yml
index 3ccb24413f1..cd901cf8b62 100644
--- a/.github/workflows/alerting-swagger-gen.yml
+++ b/.github/workflows/alerting-swagger-gen.yml
@@ -31,7 +31,7 @@ jobs:
             Please review and merge.
           branch: update-alerting-swagger-spec
           delete-branch: true
-          labels: 'area/alerting,type/docs,no-backport,no-changelog'
+          labels: 'area/alerting,type/docs,no-changelog'
           team-reviewers: 'grafana/alerting-backend-product'
           draft: false
 
diff --git a/contribute/merge-pull-request.md b/contribute/merge-pull-request.md
index ac81ef130ce..8350d98a863 100644
--- a/contribute/merge-pull-request.md
+++ b/contribute/merge-pull-request.md
@@ -115,25 +115,12 @@ In case the pull request introduces a breaking change you should document this.
 <Breaking change description>
 ```
 
-### Should the pull request be backported?
+### Backporting
 
 Backporting is the process of copying the pull request into the version branch of one or multiple previous releases.
-This should only be done for _critical bug fixes_ and involves the intervention of a Grafana Labs employee.
-To make this decision explicit, there is a **Backport Check** that is re-evaluated automatically by adding/removing labels on the pull request.
+This is a rare exception, should only be done for _critical bug fixes_, and involves the intervention of a Grafana Labs employee.
 
-#### No backport
-
-If you don't want to backport you need to add a label named **no-backport** to the pull request.
-
-This should be the default!
-
-#### Backport
-
-If your pull request fixes a critical bug and needs to go into one or several existing release branches it should be backported.
-
-For a pull request to be backported, please add it to "Critical Bug Release" form so that the delivery team is aware that a release for a previous version needs to be made.
-Once approved, the backporting process will continue from there.
-In the meantime, set the `no-backport` label.
+If your pull request fixes a critical bug and needs to be backported, add it to the "Critical Bug Release" form so the team can approve the backport and know that a release needs to be made. Specify the correct `backport vx.x` labels for the releases the fix needs to be backported to. Once approved, the backporting process will continue from there.
 
 #### Required labels
 
diff --git a/crowdin.yml b/crowdin.yml
index 82753c1d50e..1cdf69254df 100644
--- a/crowdin.yml
+++ b/crowdin.yml
@@ -6,4 +6,3 @@ pull_request_title: 'I18n: Crowdin sync'
 pull_request_labels:
   - area/internationalization
   - no-changelog
-  - no-backport