mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Remove grabpl dependency from yarn-install (#56692)
This commit is contained in:
committed by
GitHub
parent
6a74cd207a
commit
62314bbf66
@@ -308,7 +308,7 @@ def get_enterprise_pipelines(trigger, ver_mode):
|
||||
]
|
||||
}
|
||||
|
||||
for step in [wire_install_step(), yarn_install_step(), verify_gen_cue_step(edition)]:
|
||||
for step in [wire_install_step(), yarn_install_step(edition), verify_gen_cue_step(edition)]:
|
||||
step.update(deps_on_clone_enterprise_step)
|
||||
init_steps.extend([step])
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@ def test_frontend(trigger, ver_mode, edition="oss"):
|
||||
init_steps.extend([
|
||||
identify_runner_step(),
|
||||
download_grabpl_step(),
|
||||
yarn_install_step(),
|
||||
yarn_install_step(edition),
|
||||
])
|
||||
test_steps = [
|
||||
betterer_frontend_step(edition),
|
||||
|
||||
@@ -36,16 +36,17 @@ def slack_step(channel, template, secret):
|
||||
},
|
||||
}
|
||||
|
||||
def yarn_install_step():
|
||||
def yarn_install_step(edition="oss"):
|
||||
deps = []
|
||||
if edition == 'enterprise':
|
||||
deps = ['init-enterprise']
|
||||
return {
|
||||
'name': 'yarn-install',
|
||||
'image': build_image,
|
||||
'commands': [
|
||||
'yarn install --immutable',
|
||||
],
|
||||
'depends_on': [
|
||||
'grabpl',
|
||||
],
|
||||
'depends_on': deps,
|
||||
}
|
||||
|
||||
|
||||
@@ -449,6 +450,7 @@ def build_frontend_package_step(edition, ver_mode):
|
||||
'NODE_OPTIONS': '--max_old_space_size=8192',
|
||||
},
|
||||
'depends_on': [
|
||||
'compile-build-cmd',
|
||||
'yarn-install',
|
||||
],
|
||||
'commands': cmds,
|
||||
@@ -467,6 +469,7 @@ def build_plugins_step(edition, ver_mode):
|
||||
'image': build_image,
|
||||
'environment': env,
|
||||
'depends_on': [
|
||||
'compile-build-cmd',
|
||||
'yarn-install',
|
||||
],
|
||||
'commands': [
|
||||
|
||||
Reference in New Issue
Block a user