Makefile: Force use drone-cli 1.4.0 version (#40385)
* Force use drone-cli 1.4.0 * Small modifications to prevent null generation * Sign drone * Use bingo to declare drone-cli version * Update message in Makefile * Update to latest grabpl version
This commit is contained in:
@@ -113,7 +113,6 @@ def get_steps(edition, ver_mode):
|
||||
package_step(edition=edition, ver_mode=ver_mode),
|
||||
e2e_tests_server_step(edition=edition),
|
||||
e2e_tests_step(edition=edition, tries=3),
|
||||
build_storybook_step(edition=edition, ver_mode=ver_mode),
|
||||
copy_packages_for_docker_step(),
|
||||
build_docker_images_step(edition=edition, ver_mode=ver_mode, publish=should_publish),
|
||||
build_docker_images_step(edition=edition, ver_mode=ver_mode, ubuntu=True, publish=should_publish),
|
||||
@@ -121,6 +120,10 @@ def get_steps(edition, ver_mode):
|
||||
mysql_integration_tests_step(),
|
||||
])
|
||||
|
||||
build_storybook = build_storybook_step(edition=edition, ver_mode=ver_mode)
|
||||
if build_storybook:
|
||||
steps.append(build_storybook)
|
||||
|
||||
if include_enterprise2:
|
||||
steps.extend([redis_integration_tests_step(), memcached_integration_tests_step()])
|
||||
|
||||
@@ -128,10 +131,12 @@ def get_steps(edition, ver_mode):
|
||||
steps.append(upload_cdn_step(edition=edition))
|
||||
steps.append(upload_packages_step(edition=edition, ver_mode=ver_mode))
|
||||
if should_publish:
|
||||
steps.extend([
|
||||
publish_storybook_step(edition=edition, ver_mode=ver_mode),
|
||||
release_npm_packages_step(edition=edition, ver_mode=ver_mode),
|
||||
])
|
||||
publish_step = publish_storybook_step(edition=edition, ver_mode=ver_mode)
|
||||
release_npm_step = release_npm_packages_step(edition=edition, ver_mode=ver_mode)
|
||||
if publish_step:
|
||||
steps.append(publish_step)
|
||||
if release_npm_step:
|
||||
steps.append(release_npm_step)
|
||||
windows_steps = get_windows_steps(edition=edition, ver_mode=ver_mode)
|
||||
|
||||
if include_enterprise2:
|
||||
@@ -143,7 +148,9 @@ def get_steps(edition, ver_mode):
|
||||
upload_cdn_step(edition=edition2),
|
||||
])
|
||||
if should_upload:
|
||||
steps.append(upload_packages_step(edition=edition2, ver_mode=ver_mode))
|
||||
step = upload_packages_step(edition=edition2, ver_mode=ver_mode)
|
||||
if step:
|
||||
steps.append(step)
|
||||
|
||||
return steps, windows_steps
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
load('scripts/drone/vault.star', 'from_secret', 'github_token', 'pull_secret', 'drone_token')
|
||||
|
||||
grabpl_version = '2.5.1'
|
||||
grabpl_version = '2.5.2'
|
||||
build_image = 'grafana/build-container:1.4.3'
|
||||
publish_image = 'grafana/grafana-ci-deploy:1.3.1'
|
||||
grafana_docker_image = 'grafana/drone-grafana-docker:0.3.2'
|
||||
|
||||
Reference in New Issue
Block a user