Drone: Fixes

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2020-10-15 13:47:14 +02:00
parent 68a3631ed0
commit 0df7b25a49
2 changed files with 6 additions and 3 deletions
@@ -1089,7 +1089,8 @@ steps:
  image: grafana/build-container:1.2.27
  commands:
  - export DRONE_TAG=$$(./bin/grabpl parse-tag-ref ${DRONE_COMMIT_REF})
-  - mv grabpl /tmp
+  - mv bin/grabpl /tmp/
+  - rmdir bin
  - mv grafana-enterprise /tmp/
  - /tmp/grabpl init-enterprise /tmp/grafana-enterprise $${DRONE_TAG}
  - mkdir bin
@@ -1850,7 +1851,8 @@ steps:
 - name: initialize
  image: grafana/build-container:1.2.27
  commands:
-  - mv grabpl /tmp
+  - mv bin/grabpl /tmp/
+  - rmdir bin
  - mv grafana-enterprise /tmp/
  - /tmp/grabpl init-enterprise /tmp/grafana-enterprise
  - mkdir bin
@@ -160,7 +160,8 @@ def init_steps(edition, platform, ver_mode, is_downstream=False, install_deps=Tr
                    'clone',
                ],
                'commands': pre_cmds + [
-                    'mv grabpl /tmp',
+                    'mv bin/grabpl /tmp/',
+                    'rmdir bin',
                    'mv grafana-enterprise /tmp/',
                    '/tmp/grabpl init-enterprise /tmp/grafana-enterprise{}'.format(source_commit),
                    'mkdir bin',