CI: Remove variants arg from `package` step (#62858)
* Remove variants arg from package step
# Conflicts:
# .drone.yml
* Fix starlark lint
* Default to releaseModeConfig.Variants
* Check for empty variants arg
(cherry picked from commit e5c48ac945)
# Conflicts:
# .drone.yml
This commit is contained in:
committed by
GitHub
parent
5860269b82
commit
8faaacd80d
@@ -779,7 +779,7 @@ def codespell_step():
|
||||
],
|
||||
}
|
||||
|
||||
def package_step(edition, ver_mode, variants = None):
|
||||
def package_step(edition, ver_mode):
|
||||
"""Packages Grafana with the Grafana build tool.
|
||||
|
||||
Args:
|
||||
@@ -787,9 +787,6 @@ def package_step(edition, ver_mode, variants = None):
|
||||
ver_mode: controls whether the packages are signed for a release.
|
||||
If ver_mode != 'release', use the DRONE_BUILD_NUMBER environment
|
||||
variable as a build identifier.
|
||||
variants: a list of variants be passed to the package subcommand
|
||||
using the --variants option.
|
||||
Defaults to None.
|
||||
|
||||
Returns:
|
||||
Drone step.
|
||||
@@ -801,10 +798,6 @@ def package_step(edition, ver_mode, variants = None):
|
||||
"build-frontend-packages",
|
||||
]
|
||||
|
||||
variants_str = ""
|
||||
if variants:
|
||||
variants_str = " --variants {}".format(",".join(variants))
|
||||
|
||||
if ver_mode in ("main", "release", "release-branch"):
|
||||
sign_args = " --sign"
|
||||
env = {
|
||||
@@ -831,7 +824,7 @@ def package_step(edition, ver_mode, variants = None):
|
||||
build_no = "${DRONE_BUILD_NUMBER}"
|
||||
cmds = [
|
||||
"{}./bin/build package --jobs 8 --edition {} ".format(test_args, edition) +
|
||||
"--build-id {}{}{}".format(build_no, variants_str, sign_args),
|
||||
"--build-id {}{}".format(build_no, sign_args),
|
||||
]
|
||||
|
||||
return {
|
||||
|
||||
Reference in New Issue
Block a user