From 0df7b25a49466cee010fba91260ff2d014cc65df Mon Sep 17 00:00:00 2001 From: Arve Knudsen Date: Thu, 15 Oct 2020 13:46:18 +0200 Subject: [PATCH] Drone: Fixes Signed-off-by: Arve Knudsen --- .drone.yml | 6 ++++-- scripts/lib.star | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 5596065ad3f..ecfc0cdf38b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -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 diff --git a/scripts/lib.star b/scripts/lib.star index 01804eba986..36ff488d714 100644 --- a/scripts/lib.star +++ b/scripts/lib.star @@ -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',