From f5b24ed4166369f485f85a96759a892cb1d67771 Mon Sep 17 00:00:00 2001 From: Malcolm Holmes Date: Tue, 7 Dec 2021 09:50:47 +0000 Subject: [PATCH] Relocate github arg --- .drone.yml | 10 +++++----- scripts/drone/steps/lib.star | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index 6b7f14c4695..579bb3832bf 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1438,8 +1438,8 @@ steps: - mv bin/grabpl /tmp/ - rmdir bin - mv grafana-enterprise /tmp/ - - /tmp/grabpl init-enterprise /tmp/grafana-enterprise ${DRONE_TAG} --github-token - $${GITHUB_TOKEN} + - /tmp/grabpl init-enterprise --github-token $${GITHUB_TOKEN} /tmp/grafana-enterprise + ${DRONE_TAG} - mv /tmp/grafana-enterprise/deployment_tools_config.json deployment_tools_config.json - mkdir bin - mv /tmp/grabpl bin/ @@ -2457,7 +2457,7 @@ steps: - mv bin/grabpl /tmp/ - rmdir bin - mv grafana-enterprise /tmp/ - - /tmp/grabpl init-enterprise /tmp/grafana-enterprise --github-token $${GITHUB_TOKEN} + - /tmp/grabpl init-enterprise --github-token $${GITHUB_TOKEN} /tmp/grafana-enterprise - mv /tmp/grafana-enterprise/deployment_tools_config.json deployment_tools_config.json - mkdir bin - mv /tmp/grabpl bin/ @@ -3558,7 +3558,7 @@ steps: - mv bin/grabpl /tmp/ - rmdir bin - mv grafana-enterprise /tmp/ - - /tmp/grabpl init-enterprise /tmp/grafana-enterprise --github-token $${GITHUB_TOKEN} + - /tmp/grabpl init-enterprise --github-token $${GITHUB_TOKEN} /tmp/grafana-enterprise - mv /tmp/grafana-enterprise/deployment_tools_config.json deployment_tools_config.json - mkdir bin - mv /tmp/grabpl bin/ @@ -4161,6 +4161,6 @@ kind: secret name: prerelease_bucket --- kind: signature -hmac: 68f8a056d2561b5ca190ca0cb0d07af79aa4f93cbe7063618cb594d4b838977b +hmac: f4dc4a756d4767a7719a18410848fdb6f565c7b18f01b8e9f0293b0e9d022c41 ... diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star index 98fb372cd37..f8cc42c2d39 100644 --- a/scripts/drone/steps/lib.star +++ b/scripts/drone/steps/lib.star @@ -91,7 +91,7 @@ def initialize_step(edition, platform, ver_mode, is_downstream=False, install_de 'mv bin/grabpl /tmp/', 'rmdir bin', 'mv grafana-enterprise /tmp/', - '/tmp/grabpl init-enterprise /tmp/grafana-enterprise{} --github-token $${{GITHUB_TOKEN}}'.format(source_commit), + '/tmp/grabpl init-enterprise --github-token $${{GITHUB_TOKEN}} /tmp/grafana-enterprise{}'.format(source_commit), 'mv /tmp/grafana-enterprise/deployment_tools_config.json deployment_tools_config.json', 'mkdir bin', 'mv /tmp/grabpl bin/'