From 865919f6df230f9dbce82bd44bfd207b700c8e9f Mon Sep 17 00:00:00 2001
From: dsotirakis <dimitrios.sotirakis@grafana.com>
Date: Wed, 5 Oct 2022 14:29:32 +0300
Subject: [PATCH] Add rebase

---
 .drone.yml                   | 6 +++++-
 scripts/drone/steps/lib.star | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 2d547df9a65..3892860d9e5 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -371,6 +371,8 @@ steps:
   - git tag $${TEST_TAG} && git push origin $${TEST_TAG}
   - cd -
   - git fetch https://$${GITHUB_TOKEN}@github.com/grafana/grafana.git "refs/tags/*:refs/tags/*"
+    && git fetch
+  - git rebase origin/main
   - if git show-ref --tags $${TEST_TAG} --quiet; then git tag -d $${TEST_TAG} && git
     push --delete https://$${GITHUB_TOKEN}@github.com/grafana/grafana.git $${TEST_TAG};
     fi
@@ -1235,6 +1237,8 @@ steps:
   - git tag $${TEST_TAG} && git push origin $${TEST_TAG}
   - cd -
   - git fetch https://$${GITHUB_TOKEN}@github.com/grafana/grafana.git "refs/tags/*:refs/tags/*"
+    && git fetch
+  - git rebase origin/main
   - if git show-ref --tags $${TEST_TAG} --quiet; then git tag -d $${TEST_TAG} && git
     push --delete https://$${GITHUB_TOKEN}@github.com/grafana/grafana.git $${TEST_TAG};
     fi
@@ -5334,6 +5338,6 @@ kind: secret
 name: packages_secret_access_key
 ---
 kind: signature
-hmac: d12472e46f9174d71fc02a97bd869248bc15619d9aec48cc38e70e6918cba858
+hmac: 83d0f265160c3006dbf7c7c5098a893b0b821b43deb5c8db5ce9f5217a868321
 
 ...
diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star
index 0945c7c498b..61e1e46d821 100644
--- a/scripts/drone/steps/lib.star
+++ b/scripts/drone/steps/lib.star
@@ -1209,7 +1209,8 @@ def trigger_test_release():
             'if git show-ref --tags $${TEST_TAG} --quiet; then git tag -d $${TEST_TAG} && git push --delete origin $${TEST_TAG}; fi',
             'git tag $${TEST_TAG} && git push origin $${TEST_TAG}',
             'cd -',
-            'git fetch https://$${GITHUB_TOKEN}@github.com/grafana/grafana.git "refs/tags/*:refs/tags/*"',
+            'git fetch https://$${GITHUB_TOKEN}@github.com/grafana/grafana.git "refs/tags/*:refs/tags/*" && git fetch',
+            'git rebase origin/main',
             'if git show-ref --tags $${TEST_TAG} --quiet; then git tag -d $${TEST_TAG} && git push --delete https://$${GITHUB_TOKEN}@github.com/grafana/grafana.git $${TEST_TAG}; fi',
             'git tag $${TEST_TAG} && git push https://$${GITHUB_TOKEN}@github.com/grafana/grafana.git $${TEST_TAG}',
         ],