From ec21ded065e3a1890785fffca40d8b9038cde539 Mon Sep 17 00:00:00 2001 From: Dimitris Sotirakis Date: Wed, 23 Feb 2022 13:43:45 +0200 Subject: [PATCH] Docs: Remove dependency between `build-frontend` and `build-frontend-docs` (#45736) (#45768) * Remove dependency * Add yarn commands (cherry picked from commit 02640c74364dee6ca9a7381bdeb846aa31c49422) --- .drone.yml | 32 ++++++++++--------------------- scripts/drone/pipelines/docs.star | 3 --- scripts/drone/steps/lib.star | 7 +++++-- 3 files changed, 15 insertions(+), 27 deletions(-) diff --git a/.drone.yml b/.drone.yml index 48fbde73e02..b80b8481aaf 100644 --- a/.drone.yml +++ b/.drone.yml @@ -433,18 +433,12 @@ steps: image: grafana/build-container:1.4.9 name: initialize - commands: - - ./bin/grabpl build-frontend --jobs 8 --no-install-deps --edition oss --build-id - ${DRONE_BUILD_NUMBER} --no-pull-enterprise - depends_on: - - initialize - environment: - NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.4.9 - name: build-frontend -- commands: + - yarn packages:build + - yarn packages:docsExtract + - yarn packages:docsToMarkdown - ./scripts/ci-reference-docs-lint.sh ci depends_on: - - build-frontend + - initialize image: grafana/build-container:1.4.9 name: build-frontend-docs - commands: @@ -495,18 +489,12 @@ steps: image: grafana/build-container:1.4.9 name: initialize - commands: - - ./bin/grabpl build-frontend --jobs 8 --no-install-deps --edition oss --build-id - ${DRONE_BUILD_NUMBER} --no-pull-enterprise - depends_on: - - initialize - environment: - NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.4.9 - name: build-frontend -- commands: + - yarn packages:build + - yarn packages:docsExtract + - yarn packages:docsToMarkdown - ./scripts/ci-reference-docs-lint.sh ci depends_on: - - build-frontend + - initialize image: grafana/build-container:1.4.9 name: build-frontend-docs - commands: @@ -658,7 +646,7 @@ steps: name: trigger-enterprise-downstream settings: params: - - SOURCE_BUILD_NUMBER=${DRONE_BUILD_NUMBER} + - SOURCE_BUILD_NUMBER=${DRONE_COMMIT} - SOURCE_COMMIT=${DRONE_COMMIT} repositories: - grafana/grafana-enterprise@main @@ -4319,6 +4307,6 @@ kind: secret name: gcp_upload_artifacts_key --- kind: signature -hmac: 011d56e150c01783fc938e3ec48927c907aff264705b045eba83a1c0ada4188e +hmac: 00db25c63a60b8ec746ba04cfb45084e8e8b2405ecfeae67422d7cb3eaba8527 ... diff --git a/scripts/drone/pipelines/docs.star b/scripts/drone/pipelines/docs.star index d7d9f92ad26..be19f140c73 100644 --- a/scripts/drone/pipelines/docs.star +++ b/scripts/drone/pipelines/docs.star @@ -26,9 +26,6 @@ load( def docs_pipelines(edition, ver_mode, trigger): 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 steps.extend([ diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star index 996dd3d5825..fca83015999 100644 --- a/scripts/drone/steps/lib.star +++ b/scripts/drone/steps/lib.star @@ -189,7 +189,7 @@ def enterprise_downstream_step(edition): 'grafana/grafana-enterprise@main', ], 'params': [ - 'SOURCE_BUILD_NUMBER=${DRONE_BUILD_NUMBER}', + 'SOURCE_BUILD_NUMBER=${DRONE_COMMIT}', 'SOURCE_COMMIT=${DRONE_COMMIT}', ], }, @@ -427,9 +427,12 @@ def build_frontend_docs_step(edition): 'name': 'build-frontend-docs', 'image': build_image, 'depends_on': [ - 'build-frontend' + 'initialize' ], 'commands': [ + 'yarn packages:build', + 'yarn packages:docsExtract', + 'yarn packages:docsToMarkdown', './scripts/ci-reference-docs-lint.sh ci', ] }