Docs: Remove dependency between build-frontend and build-frontend-docs (#45736)

* Remove dependency

* Add yarn commands
This commit is contained in:
Dimitris Sotirakis 2022-02-22 18:02:36 +02:00 committed by GitHub
parent 68ef0e1f84
commit 02640c7436
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 18 deletions

View File

@ -433,18 +433,12 @@ steps:
image: grafana/build-container:1.4.9 image: grafana/build-container:1.4.9
name: initialize name: initialize
- commands: - commands:
- ./bin/grabpl build-frontend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} - yarn packages:build
--no-pull-enterprise - yarn packages:docsExtract
depends_on: - yarn packages:docsToMarkdown
- initialize
environment:
NODE_OPTIONS: --max_old_space_size=8192
image: grafana/build-container:1.4.9
name: build-frontend
- commands:
- ./scripts/ci-reference-docs-lint.sh ci - ./scripts/ci-reference-docs-lint.sh ci
depends_on: depends_on:
- build-frontend - initialize
image: grafana/build-container:1.4.9 image: grafana/build-container:1.4.9
name: build-frontend-docs name: build-frontend-docs
- commands: - commands:
@ -599,7 +593,7 @@ steps:
name: trigger-enterprise-downstream name: trigger-enterprise-downstream
settings: settings:
params: params:
- SOURCE_BUILD_NUMBER=${DRONE_BUILD_NUMBER} - SOURCE_BUILD_NUMBER=${DRONE_COMMIT}
- SOURCE_COMMIT=${DRONE_COMMIT} - SOURCE_COMMIT=${DRONE_COMMIT}
repositories: repositories:
- grafana/grafana-enterprise@main - grafana/grafana-enterprise@main
@ -809,9 +803,12 @@ steps:
image: grafana/build-container:1.4.9 image: grafana/build-container:1.4.9
name: publish-frontend-metrics name: publish-frontend-metrics
- commands: - commands:
- yarn packages:build
- yarn packages:docsExtract
- yarn packages:docsToMarkdown
- ./scripts/ci-reference-docs-lint.sh ci - ./scripts/ci-reference-docs-lint.sh ci
depends_on: depends_on:
- build-frontend - initialize
image: grafana/build-container:1.4.9 image: grafana/build-container:1.4.9
name: build-frontend-docs name: build-frontend-docs
- commands: - commands:
@ -4264,6 +4261,6 @@ kind: secret
name: gcp_upload_artifacts_key name: gcp_upload_artifacts_key
--- ---
kind: signature kind: signature
hmac: b02f6b686b120ff88a1f412a9cab4b3d295783f3e8cabde336b446083fe6433c hmac: f209cfff82a4817d7bae67872ce1a34a4a26915451ae35b4f8c9848003b18b91
... ...

View File

@ -27,9 +27,6 @@ ver_mode = 'pr'
def docs_pipelines(edition): def docs_pipelines(edition):
steps = [download_grabpl_step()] + initialize_step(edition, platform='linux', ver_mode=ver_mode) steps = [download_grabpl_step()] + initialize_step(edition, platform='linux', ver_mode=ver_mode)
steps.extend([
build_frontend_step(edition=edition, ver_mode=ver_mode),
])
# Insert remaining steps # Insert remaining steps
steps.extend([ steps.extend([

View File

@ -189,7 +189,7 @@ def enterprise_downstream_step(edition):
'grafana/grafana-enterprise@main', 'grafana/grafana-enterprise@main',
], ],
'params': [ 'params': [
'SOURCE_BUILD_NUMBER=${DRONE_BUILD_NUMBER}', 'SOURCE_BUILD_NUMBER=${DRONE_COMMIT}',
'SOURCE_COMMIT=${DRONE_COMMIT}', 'SOURCE_COMMIT=${DRONE_COMMIT}',
], ],
}, },
@ -427,9 +427,12 @@ def build_frontend_docs_step(edition):
'name': 'build-frontend-docs', 'name': 'build-frontend-docs',
'image': build_image, 'image': build_image,
'depends_on': [ 'depends_on': [
'build-frontend' 'initialize'
], ],
'commands': [ 'commands': [
'yarn packages:build',
'yarn packages:docsExtract',
'yarn packages:docsToMarkdown',
'./scripts/ci-reference-docs-lint.sh ci', './scripts/ci-reference-docs-lint.sh ci',
] ]
} }