From 242db64158df3edcb6f7c7a65ff40fc3c8bb897e Mon Sep 17 00:00:00 2001
From: Stephanie Closson <srclosson@gmail.com>
Date: Wed, 8 Apr 2020 09:22:36 -0600
Subject: [PATCH] Learnings from latest automated git publish. Small tweaks
 (#23440)

---
 .../docker/grafana-plugin-ci/test/docker-compose.yml      | 2 ++
 .../docker/grafana-plugin-ci/test/start.sh                | 6 ++++++
 packages/grafana-toolkit/src/cli/tasks/plugin.utils.ts    | 8 +++++---
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci/test/docker-compose.yml b/packages/grafana-toolkit/docker/grafana-plugin-ci/test/docker-compose.yml
index 7dc66924f78..d734b3a38e6 100644
--- a/packages/grafana-toolkit/docker/grafana-plugin-ci/test/docker-compose.yml
+++ b/packages/grafana-toolkit/docker/grafana-plugin-ci/test/docker-compose.yml
@@ -6,3 +6,5 @@ services:
     volumes:
       - ../scripts:/home/circleci/scripts
       - ../install:/home/circleci/install
+      - ${HOME}/.ssh:/root/.ssh
+      - ../../..:/home/circleci/grafana-toolkit
diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci/test/start.sh b/packages/grafana-toolkit/docker/grafana-plugin-ci/test/start.sh
index 486ff5a6994..af3d91cb4a0 100755
--- a/packages/grafana-toolkit/docker/grafana-plugin-ci/test/start.sh
+++ b/packages/grafana-toolkit/docker/grafana-plugin-ci/test/start.sh
@@ -1,4 +1,10 @@
 #!/bin/bash
 
+function finish {
+  echo "Exiting and cleaning up docker image"
+  docker-compose down
+}
+trap finish EXIT
+
 # Enter the docker container
 docker-compose run citest bash -c "cd /home/circleci; exec bash --login -i"
diff --git a/packages/grafana-toolkit/src/cli/tasks/plugin.utils.ts b/packages/grafana-toolkit/src/cli/tasks/plugin.utils.ts
index f3d28e7b2d7..55e7735554e 100755
--- a/packages/grafana-toolkit/src/cli/tasks/plugin.utils.ts
+++ b/packages/grafana-toolkit/src/cli/tasks/plugin.utils.ts
@@ -69,10 +69,11 @@ const prepareRelease = useSpinner<any>('Preparing release', async ({ dryrun, ver
     ['git', ['config', 'user.email', DEFAULT_EMAIL_ADDRESS]],
     ['git', ['config', 'user.name', DEFAULT_USERNAME]],
     await checkoutBranch(`release-${pluginJson.info.version}`),
-    ['cp', ['-rf', distContentDir, 'dist']],
-    ['git', ['add', '--force', distDir], { dryrun }],
+    ['/bin/rm', ['-rf', 'dist'], { dryrun }],
+    ['mv', ['-v', distContentDir, 'dist']],
     ['git', ['add', '--force', 'dist'], { dryrun }],
     ['/bin/rm', ['-rf', 'src'], { enterprise: true }],
+    ['git', ['rm', '-rf', 'src'], { enterprise: true }],
     [
       'git',
       ['commit', '-m', `automated release ${pluginJson.info.version} [skip ci]`],
@@ -81,8 +82,9 @@ const prepareRelease = useSpinner<any>('Preparing release', async ({ dryrun, ver
         okOnError: [/nothing to commit/g, /nothing added to commit/g, /no changes added to commit/g],
       },
     ],
-    ['git', ['tag', '-f', pluginJson.info.version]],
     ['git', ['push', '-f', 'origin', `release-${pluginJson.info.version}`], { dryrun }],
+    ['git', ['tag', '-f', `v${pluginJson.info.version}`]],
+    ['git', ['push', '-f', 'origin', `v${pluginJson.info.version}`]],
   ];
 
   for (let line of githubPublishScript) {