IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove grabpl dependency from yarn-install (#56692)

Browse Source
This commit is contained in:
Dimitris Sotirakis 2022-10-11 18:58:03 +03:00 committed by GitHub
parent 6a74cd207a
commit 62314bbf66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
.drone.yml
View File

@ -79,8 +79,7 @@ steps:
name: grabpl name: grabpl
- commands: - commands:
- yarn install --immutable - yarn install --immutable
depends_on: depends_on: []
- grabpl
image: grafana/build-container:1.6.3 image: grafana/build-container:1.6.3
name: yarn-install name: yarn-install
- commands: - commands:
@ -352,8 +351,7 @@ steps:
name: wire-install name: wire-install
- commands: - commands:
- yarn install --immutable - yarn install --immutable
depends_on: depends_on: []
- grabpl
image: grafana/build-container:1.6.3 image: grafana/build-container:1.6.3
name: yarn-install name: yarn-install
- commands: - commands:
@ -420,6 +418,7 @@ steps:
- commands: - commands:
- ./bin/build build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} - ./bin/build build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER}
depends_on: depends_on:
- compile-build-cmd
- yarn-install - yarn-install
environment: environment:
NODE_OPTIONS: --max_old_space_size=8192 NODE_OPTIONS: --max_old_space_size=8192
@ -428,6 +427,7 @@ steps:
- commands: - commands:
- ./bin/build build-plugins --jobs 8 --edition oss - ./bin/build build-plugins --jobs 8 --edition oss
depends_on: depends_on:
- compile-build-cmd
- yarn-install - yarn-install
environment: null environment: null
image: grafana/build-container:1.6.3 image: grafana/build-container:1.6.3
@ -736,8 +736,7 @@ steps:
name: identify-runner name: identify-runner
- commands: - commands:
- yarn install --immutable - yarn install --immutable
depends_on: depends_on: []
- grabpl
image: grafana/build-container:1.6.3 image: grafana/build-container:1.6.3
name: yarn-install name: yarn-install
- commands: - commands:
@ -850,8 +849,7 @@ steps:
name: identify-runner name: identify-runner
- commands: - commands:
- yarn install --immutable - yarn install --immutable
depends_on: depends_on: []
- grabpl
image: grafana/build-container:1.6.3 image: grafana/build-container:1.6.3
name: yarn-install name: yarn-install
- commands: - commands:
@ -922,8 +920,7 @@ steps:
name: grabpl name: grabpl
- commands: - commands:
- yarn install --immutable - yarn install --immutable
depends_on: depends_on: []
- grabpl
image: grafana/build-container:1.6.3 image: grafana/build-container:1.6.3
name: yarn-install name: yarn-install
- commands: - commands:
@ -1182,8 +1179,7 @@ steps:
name: wire-install name: wire-install
- commands: - commands:
- yarn install --immutable - yarn install --immutable
depends_on: depends_on: []
- grabpl
image: grafana/build-container:1.6.3 image: grafana/build-container:1.6.3
name: yarn-install name: yarn-install
- commands: - commands:
@ -1237,6 +1233,7 @@ steps:
- commands: - commands:
- ./bin/build build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} - ./bin/build build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER}
depends_on: depends_on:
- compile-build-cmd
- yarn-install - yarn-install
environment: environment:
NODE_OPTIONS: --max_old_space_size=8192 NODE_OPTIONS: --max_old_space_size=8192
@ -1245,6 +1242,7 @@ steps:
- commands: - commands:
- ./bin/build build-plugins --jobs 8 --edition oss - ./bin/build build-plugins --jobs 8 --edition oss
depends_on: depends_on:
- compile-build-cmd
- yarn-install - yarn-install
environment: environment:
GRAFANA_API_KEY: GRAFANA_API_KEY:
@ -1958,8 +1956,7 @@ steps:
name: wire-install name: wire-install
- commands: - commands:
- yarn install --immutable - yarn install --immutable
depends_on: depends_on: []
- grabpl
image: grafana/build-container:1.6.3 image: grafana/build-container:1.6.3
name: yarn-install name: yarn-install
- commands: - commands:
@ -1988,6 +1985,7 @@ steps:
- commands: - commands:
- ./bin/build build-frontend-packages --jobs 8 --edition oss ${DRONE_TAG} - ./bin/build build-frontend-packages --jobs 8 --edition oss ${DRONE_TAG}
depends_on: depends_on:
- compile-build-cmd
- yarn-install - yarn-install
environment: environment:
NODE_OPTIONS: --max_old_space_size=8192 NODE_OPTIONS: --max_old_space_size=8192
@ -1996,6 +1994,7 @@ steps:
- commands: - commands:
- ./bin/build build-plugins --jobs 8 --edition oss - ./bin/build build-plugins --jobs 8 --edition oss
depends_on: depends_on:
- compile-build-cmd
- yarn-install - yarn-install
environment: environment:
GRAFANA_API_KEY: GRAFANA_API_KEY:
@ -2248,8 +2247,7 @@ steps:
name: grabpl name: grabpl
- commands: - commands:
- yarn install --immutable - yarn install --immutable
depends_on: depends_on: []
- grabpl
image: grafana/build-container:1.6.3 image: grafana/build-container:1.6.3
name: yarn-install name: yarn-install
- commands: - commands:
@ -2620,6 +2618,7 @@ steps:
- commands: - commands:
- ./bin/build build-frontend-packages --jobs 8 --edition enterprise ${DRONE_TAG} - ./bin/build build-frontend-packages --jobs 8 --edition enterprise ${DRONE_TAG}
depends_on: depends_on:
- compile-build-cmd
- yarn-install - yarn-install
environment: environment:
NODE_OPTIONS: --max_old_space_size=8192 NODE_OPTIONS: --max_old_space_size=8192
@ -2628,6 +2627,7 @@ steps:
- commands: - commands:
- ./bin/build build-plugins --jobs 8 --edition enterprise - ./bin/build build-plugins --jobs 8 --edition enterprise
depends_on: depends_on:
- compile-build-cmd
- yarn-install - yarn-install
environment: environment:
GRAFANA_API_KEY: GRAFANA_API_KEY:
@ -2919,7 +2919,7 @@ steps:
- commands: - commands:
- yarn install --immutable - yarn install --immutable
depends_on: depends_on:
- grabpl - init-enterprise
image: grafana/build-container:1.6.3 image: grafana/build-container:1.6.3
name: yarn-install name: yarn-install
- commands: - commands:
@ -3731,8 +3731,7 @@ steps:
name: grabpl name: grabpl
- commands: - commands:
- yarn install --immutable - yarn install --immutable
depends_on: depends_on: []
- grabpl
image: grafana/build-container:1.6.3 image: grafana/build-container:1.6.3
name: yarn-install name: yarn-install
- commands: - commands:
@ -4029,8 +4028,7 @@ steps:
name: wire-install name: wire-install
- commands: - commands:
- yarn install --immutable - yarn install --immutable
depends_on: depends_on: []
- grabpl
image: grafana/build-container:1.6.3 image: grafana/build-container:1.6.3
name: yarn-install name: yarn-install
- commands: - commands:
@ -4059,6 +4057,7 @@ steps:
- commands: - commands:
- ./bin/build build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} - ./bin/build build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER}
depends_on: depends_on:
- compile-build-cmd
- yarn-install - yarn-install
environment: environment:
NODE_OPTIONS: --max_old_space_size=8192 NODE_OPTIONS: --max_old_space_size=8192
@ -4067,6 +4066,7 @@ steps:
- commands: - commands:
- ./bin/build build-plugins --jobs 8 --edition oss - ./bin/build build-plugins --jobs 8 --edition oss
depends_on: depends_on:
- compile-build-cmd
- yarn-install - yarn-install
environment: environment:
GRAFANA_API_KEY: GRAFANA_API_KEY:
@ -4291,8 +4291,7 @@ steps:
name: grabpl name: grabpl
- commands: - commands:
- yarn install --immutable - yarn install --immutable
depends_on: depends_on: []
- grabpl
image: grafana/build-container:1.6.3 image: grafana/build-container:1.6.3
name: yarn-install name: yarn-install
- commands: - commands:
@ -4644,6 +4643,7 @@ steps:
- commands: - commands:
- ./bin/build build-frontend-packages --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} - ./bin/build build-frontend-packages --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER}
depends_on: depends_on:
- compile-build-cmd
- yarn-install - yarn-install
environment: environment:
NODE_OPTIONS: --max_old_space_size=8192 NODE_OPTIONS: --max_old_space_size=8192
@ -4652,6 +4652,7 @@ steps:
- commands: - commands:
- ./bin/build build-plugins --jobs 8 --edition enterprise - ./bin/build build-plugins --jobs 8 --edition enterprise
depends_on: depends_on:
- compile-build-cmd
- yarn-install - yarn-install
environment: environment:
GRAFANA_API_KEY: GRAFANA_API_KEY:
@ -4935,7 +4936,7 @@ steps:
- commands: - commands:
- yarn install --immutable - yarn install --immutable
depends_on: depends_on:
- grabpl - init-enterprise
image: grafana/build-container:1.6.3 image: grafana/build-container:1.6.3
name: yarn-install name: yarn-install
- commands: - commands:
@ -5602,6 +5603,6 @@ kind: secret
name: packages_secret_access_key name: packages_secret_access_key
--- ---
kind: signature kind: signature
hmac: d5d39719ea023fdedb6cfa303ed2acac29fe23060c9679c0c40511b3cc215738 hmac: b4e9ae069d6557aeb32126291f2b06a1a0df3311e609acbe0d3c3810f1606312
... ...

2
scripts/drone/events/release.star
View File

@ -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) step.update(deps_on_clone_enterprise_step)
init_steps.extend([step]) init_steps.extend([step])

2
scripts/drone/pipelines/test_frontend.star
View File

@ -22,7 +22,7 @@ def test_frontend(trigger, ver_mode, edition="oss"):
init_steps.extend([ init_steps.extend([
identify_runner_step(), identify_runner_step(),
download_grabpl_step(), download_grabpl_step(),
yarn_install_step(), yarn_install_step(edition),
]) ])
test_steps = [ test_steps = [
betterer_frontend_step(edition), betterer_frontend_step(edition),

11
scripts/drone/steps/lib.star
View File

@ -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 { return {
'name': 'yarn-install', 'name': 'yarn-install',
'image': build_image, 'image': build_image,
'commands': [ 'commands': [
'yarn install --immutable', 'yarn install --immutable',
], ],
'depends_on': [ 'depends_on': deps,
'grabpl',
],
} }
@ -449,6 +450,7 @@ def build_frontend_package_step(edition, ver_mode):
'NODE_OPTIONS': '--max_old_space_size=8192', 'NODE_OPTIONS': '--max_old_space_size=8192',
}, },
'depends_on': [ 'depends_on': [
'compile-build-cmd',
'yarn-install', 'yarn-install',
], ],
'commands': cmds, 'commands': cmds,
@ -467,6 +469,7 @@ def build_plugins_step(edition, ver_mode):
'image': build_image, 'image': build_image,
'environment': env, 'environment': env,
'depends_on': [ 'depends_on': [
'compile-build-cmd',
'yarn-install', 'yarn-install',
], ],
'commands': [ 'commands': [