From 9582e0afd94c90c6e014333ba9cb7896fa0468e1 Mon Sep 17 00:00:00 2001
From: Arve Knudsen <arve.knudsen@gmail.com>
Date: Tue, 10 Nov 2020 15:44:21 +0100
Subject: [PATCH] Drone: Fix docs building (#28986)

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
---
 .drone.yml          | 12 +-----------
 scripts/lib.star    |  2 +-
 scripts/master.star |  2 --
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 4949a3f0aa6..5907fdd4429 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -159,7 +159,7 @@ steps:
   image: grafana/docs-base:latest
   commands:
   - mkdir -p /hugo/content/docs/grafana
-  - cp -r docs/sources /hugo/content/docs/grafana/latest
+  - cp -r docs/sources/* /hugo/content/docs/grafana/latest/
   - cd /hugo && make prod
   depends_on:
   - initialize
@@ -440,16 +440,6 @@ steps:
   depends_on:
   - build-frontend
 
-- name: build-docs-website
-  image: grafana/docs-base:latest
-  commands:
-  - mkdir -p /hugo/content/docs/grafana
-  - cp -r docs/sources /hugo/content/docs/grafana/latest
-  - cd /hugo && make prod
-  depends_on:
-  - initialize
-  - build-frontend-docs
-
 - name: copy-packages-for-docker
   image: grafana/build-container:1.2.28
   commands:
diff --git a/scripts/lib.star b/scripts/lib.star
index 9778943d84c..a7d7276874e 100644
--- a/scripts/lib.star
+++ b/scripts/lib.star
@@ -637,7 +637,7 @@ def build_docs_website_step():
         ],
         'commands': [
             'mkdir -p /hugo/content/docs/grafana',
-            'cp -r docs/sources /hugo/content/docs/grafana/latest',
+            'cp -r docs/sources/* /hugo/content/docs/grafana/latest/',
             'cd /hugo && make prod',
         ],
     }
diff --git a/scripts/master.star b/scripts/master.star
index 89f53ceb3c7..874d4ed4701 100644
--- a/scripts/master.star
+++ b/scripts/master.star
@@ -14,7 +14,6 @@ load(
     'e2e_tests_step',
     'build_storybook_step',
     'build_frontend_docs_step',
-    'build_docs_website_step',
     'copy_packages_for_docker_step',
     'build_docker_images_step',
     'postgres_integration_tests_step',
@@ -54,7 +53,6 @@ def get_steps(edition, is_downstream=False):
         build_storybook_step(edition=edition, ver_mode=ver_mode),
         publish_storybook_step(edition=edition, ver_mode=ver_mode),
         build_frontend_docs_step(edition=edition),
-        build_docs_website_step(),
         copy_packages_for_docker_step(),
         build_docker_images_step(edition=edition, ver_mode=ver_mode, publish=publish),
         build_docker_images_step(edition=edition, ver_mode=ver_mode, ubuntu=True, publish=publish),