Skip to content

Commit 62314bb

Browse files
dsotirakisdsotirakis
authored
Remove grabpl dependency from yarn-install (grafana#56692)
1 parent 6a74cd2 commit 62314bb

File tree

4 files changed

+35
-31
lines changed

4 files changed

+35
-31
lines changed

‎.drone.yml‎

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,7 @@ steps:
7979
name: grabpl
8080
- commands:
8181
- yarn install --immutable
82-
depends_on:
83-
- grabpl
82+
depends_on: []
8483
image: grafana/build-container:1.6.3
8584
name: yarn-install
8685
- commands:
@@ -352,8 +351,7 @@ steps:
352351
name: wire-install
353352
- commands:
354353
- yarn install --immutable
355-
depends_on:
356-
- grabpl
354+
depends_on: []
357355
image: grafana/build-container:1.6.3
358356
name: yarn-install
359357
- commands:
@@ -420,6 +418,7 @@ steps:
420418
- commands:
421419
- ./bin/build build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER}
422420
depends_on:
421+
- compile-build-cmd
423422
- yarn-install
424423
environment:
425424
NODE_OPTIONS: --max_old_space_size=8192
@@ -428,6 +427,7 @@ steps:
428427
- commands:
429428
- ./bin/build build-plugins --jobs 8 --edition oss
430429
depends_on:
430+
- compile-build-cmd
431431
- yarn-install
432432
environment: null
433433
image: grafana/build-container:1.6.3
@@ -736,8 +736,7 @@ steps:
736736
name: identify-runner
737737
- commands:
738738
- yarn install --immutable
739-
depends_on:
740-
- grabpl
739+
depends_on: []
741740
image: grafana/build-container:1.6.3
742741
name: yarn-install
743742
- commands:
@@ -850,8 +849,7 @@ steps:
850849
name: identify-runner
851850
- commands:
852851
- yarn install --immutable
853-
depends_on:
854-
- grabpl
852+
depends_on: []
855853
image: grafana/build-container:1.6.3
856854
name: yarn-install
857855
- commands:
@@ -922,8 +920,7 @@ steps:
922920
name: grabpl
923921
- commands:
924922
- yarn install --immutable
925-
depends_on:
926-
- grabpl
923+
depends_on: []
927924
image: grafana/build-container:1.6.3
928925
name: yarn-install
929926
- commands:
@@ -1182,8 +1179,7 @@ steps:
11821179
name: wire-install
11831180
- commands:
11841181
- yarn install --immutable
1185-
depends_on:
1186-
- grabpl
1182+
depends_on: []
11871183
image: grafana/build-container:1.6.3
11881184
name: yarn-install
11891185
- commands:
@@ -1237,6 +1233,7 @@ steps:
12371233
- commands:
12381234
- ./bin/build build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER}
12391235
depends_on:
1236+
- compile-build-cmd
12401237
- yarn-install
12411238
environment:
12421239
NODE_OPTIONS: --max_old_space_size=8192
@@ -1245,6 +1242,7 @@ steps:
12451242
- commands:
12461243
- ./bin/build build-plugins --jobs 8 --edition oss
12471244
depends_on:
1245+
- compile-build-cmd
12481246
- yarn-install
12491247
environment:
12501248
GRAFANA_API_KEY:
@@ -1958,8 +1956,7 @@ steps:
19581956
name: wire-install
19591957
- commands:
19601958
- yarn install --immutable
1961-
depends_on:
1962-
- grabpl
1959+
depends_on: []
19631960
image: grafana/build-container:1.6.3
19641961
name: yarn-install
19651962
- commands:
@@ -1988,6 +1985,7 @@ steps:
19881985
- commands:
19891986
- ./bin/build build-frontend-packages --jobs 8 --edition oss ${DRONE_TAG}
19901987
depends_on:
1988+
- compile-build-cmd
19911989
- yarn-install
19921990
environment:
19931991
NODE_OPTIONS: --max_old_space_size=8192
@@ -1996,6 +1994,7 @@ steps:
19961994
- commands:
19971995
- ./bin/build build-plugins --jobs 8 --edition oss
19981996
depends_on:
1997+
- compile-build-cmd
19991998
- yarn-install
20001999
environment:
20012000
GRAFANA_API_KEY:
@@ -2248,8 +2247,7 @@ steps:
22482247
name: grabpl
22492248
- commands:
22502249
- yarn install --immutable
2251-
depends_on:
2252-
- grabpl
2250+
depends_on: []
22532251
image: grafana/build-container:1.6.3
22542252
name: yarn-install
22552253
- commands:
@@ -2620,6 +2618,7 @@ steps:
26202618
- commands:
26212619
- ./bin/build build-frontend-packages --jobs 8 --edition enterprise ${DRONE_TAG}
26222620
depends_on:
2621+
- compile-build-cmd
26232622
- yarn-install
26242623
environment:
26252624
NODE_OPTIONS: --max_old_space_size=8192
@@ -2628,6 +2627,7 @@ steps:
26282627
- commands:
26292628
- ./bin/build build-plugins --jobs 8 --edition enterprise
26302629
depends_on:
2630+
- compile-build-cmd
26312631
- yarn-install
26322632
environment:
26332633
GRAFANA_API_KEY:
@@ -2919,7 +2919,7 @@ steps:
29192919
- commands:
29202920
- yarn install --immutable
29212921
depends_on:
2922-
- grabpl
2922+
- init-enterprise
29232923
image: grafana/build-container:1.6.3
29242924
name: yarn-install
29252925
- commands:
@@ -3731,8 +3731,7 @@ steps:
37313731
name: grabpl
37323732
- commands:
37333733
- yarn install --immutable
3734-
depends_on:
3735-
- grabpl
3734+
depends_on: []
37363735
image: grafana/build-container:1.6.3
37373736
name: yarn-install
37383737
- commands:
@@ -4029,8 +4028,7 @@ steps:
40294028
name: wire-install
40304029
- commands:
40314030
- yarn install --immutable
4032-
depends_on:
4033-
- grabpl
4031+
depends_on: []
40344032
image: grafana/build-container:1.6.3
40354033
name: yarn-install
40364034
- commands:
@@ -4059,6 +4057,7 @@ steps:
40594057
- commands:
40604058
- ./bin/build build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER}
40614059
depends_on:
4060+
- compile-build-cmd
40624061
- yarn-install
40634062
environment:
40644063
NODE_OPTIONS: --max_old_space_size=8192
@@ -4067,6 +4066,7 @@ steps:
40674066
- commands:
40684067
- ./bin/build build-plugins --jobs 8 --edition oss
40694068
depends_on:
4069+
- compile-build-cmd
40704070
- yarn-install
40714071
environment:
40724072
GRAFANA_API_KEY:
@@ -4291,8 +4291,7 @@ steps:
42914291
name: grabpl
42924292
- commands:
42934293
- yarn install --immutable
4294-
depends_on:
4295-
- grabpl
4294+
depends_on: []
42964295
image: grafana/build-container:1.6.3
42974296
name: yarn-install
42984297
- commands:
@@ -4644,6 +4643,7 @@ steps:
46444643
- commands:
46454644
- ./bin/build build-frontend-packages --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER}
46464645
depends_on:
4646+
- compile-build-cmd
46474647
- yarn-install
46484648
environment:
46494649
NODE_OPTIONS: --max_old_space_size=8192
@@ -4652,6 +4652,7 @@ steps:
46524652
- commands:
46534653
- ./bin/build build-plugins --jobs 8 --edition enterprise
46544654
depends_on:
4655+
- compile-build-cmd
46554656
- yarn-install
46564657
environment:
46574658
GRAFANA_API_KEY:
@@ -4935,7 +4936,7 @@ steps:
49354936
- commands:
49364937
- yarn install --immutable
49374938
depends_on:
4938-
- grabpl
4939+
- init-enterprise
49394940
image: grafana/build-container:1.6.3
49404941
name: yarn-install
49414942
- commands:
@@ -5602,6 +5603,6 @@ kind: secret
56025603
name: packages_secret_access_key
56035604
---
56045605
kind: signature
5605-
hmac: d5d39719ea023fdedb6cfa303ed2acac29fe23060c9679c0c40511b3cc215738
5606+
hmac: b4e9ae069d6557aeb32126291f2b06a1a0df3311e609acbe0d3c3810f1606312
56065607

56075608
...

‎scripts/drone/events/release.star‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ def get_enterprise_pipelines(trigger, ver_mode):
308308
]
309309
}
310310

311-
for step in [wire_install_step(), yarn_install_step(), verify_gen_cue_step(edition)]:
311+
for step in [wire_install_step(), yarn_install_step(edition), verify_gen_cue_step(edition)]:
312312
step.update(deps_on_clone_enterprise_step)
313313
init_steps.extend([step])
314314

‎scripts/drone/pipelines/test_frontend.star‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def test_frontend(trigger, ver_mode, edition="oss"):
2222
init_steps.extend([
2323
identify_runner_step(),
2424
download_grabpl_step(),
25-
yarn_install_step(),
25+
yarn_install_step(edition),
2626
])
2727
test_steps = [
2828
betterer_frontend_step(edition),

‎scripts/drone/steps/lib.star‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,17 @@ def slack_step(channel, template, secret):
3636
},
3737
}
3838

39-
def yarn_install_step():
39+
def yarn_install_step(edition="oss"):
40+
deps = []
41+
if edition == 'enterprise':
42+
deps = ['init-enterprise']
4043
return {
4144
'name': 'yarn-install',
4245
'image': build_image,
4346
'commands': [
4447
'yarn install --immutable',
4548
],
46-
'depends_on': [
47-
'grabpl',
48-
],
49+
'depends_on': deps,
4950
}
5051

5152

@@ -449,6 +450,7 @@ def build_frontend_package_step(edition, ver_mode):
449450
'NODE_OPTIONS': '--max_old_space_size=8192',
450451
},
451452
'depends_on': [
453+
'compile-build-cmd',
452454
'yarn-install',
453455
],
454456
'commands': cmds,
@@ -467,6 +469,7 @@ def build_plugins_step(edition, ver_mode):
467469
'image': build_image,
468470
'environment': env,
469471
'depends_on': [
472+
'compile-build-cmd',
470473
'yarn-install',
471474
],
472475
'commands': [

0 commit comments

Comments
 (0)