From 6d072ad84df8ea454248b219e6e778ce0b9ad664 Mon Sep 17 00:00:00 2001
From: malcolmholmes <42545407+malcolmholmes@users.noreply.github.com>
Date: Mon, 17 Jan 2022 16:00:53 +0000
Subject: [PATCH] Split prepare-release (#44124)

---
 .github/workflows/milestone.yml       | 21 +++++++++++++++++++++
 .github/workflows/prepare-release.yml | 12 +++---------
 2 files changed, 24 insertions(+), 9 deletions(-)
 create mode 100644 .github/workflows/milestone.yml

diff --git a/.github/workflows/milestone.yml b/.github/workflows/milestone.yml
new file mode 100644
index 00000000000..d4238e61a2a
--- /dev/null
+++ b/.github/workflows/milestone.yml
@@ -0,0 +1,21 @@
+name: Close Milestone
+on:
+  workflow_dispatch:
+    inputs:
+      version_input:
+        description: 'The version to be released please respect: major.minor.patch or major.minor.patch-beta<number> format. example: 7.4.3 or 7.4.3-beta1'
+        required: true
+jobs:
+  call-remove-milestone:
+    uses: grafana/grafana/.github/workflows/remove-milestone.yml@main
+    with:
+      version_call: ${{ github.event.inputs.version_input }}
+    secrets:
+      token: ${{ secrets.GH_BOT_ACCESS_TOKEN }}
+  call-close-milestone:
+    uses: grafana/grafana/.github/workflows/close-milestone.yml@main
+    with:
+      version_call: ${{ github.event.inputs.version_input }}
+    secrets:
+      token: ${{ secrets.GH_BOT_ACCESS_TOKEN }}
+    needs: call-remove-milestone
\ No newline at end of file
diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
index 0efb522af15..3bf5a7b9ead 100644
--- a/.github/workflows/prepare-release.yml
+++ b/.github/workflows/prepare-release.yml
@@ -6,19 +6,13 @@ on:
         description: 'The version to be released please respect: major.minor.patch or major.minor.patch-beta<number> format. example: 7.4.3 or 7.4.3-beta1'
         required: true
 jobs:
-  call-remove-milestone:
-    uses: grafana/grafana/.github/workflows/remove-milestone.yml@main
+  call-bump-version:
+    uses: grafana/grafana/.github/workflows/bump-version.yml@main
     with:
       version_call: ${{ github.event.inputs.version_input }}
     secrets:
       token: ${{ secrets.GH_BOT_ACCESS_TOKEN }}
-  call-close-milestone:
-    uses: grafana/grafana/.github/workflows/close-milestone.yml@main
-    with:
-      version_call: ${{ github.event.inputs.version_input }}
-    secrets:
-      token: ${{ secrets.GH_BOT_ACCESS_TOKEN }}
-    needs: call-remove-milestone
+      metricsWriteAPIKey: ${{ secrets.GRAFANA_MISC_STATS_API_KEY }}
   call-update-changelog:
     uses: grafana/grafana/.github/workflows/update-changelog.yml@main
     with: