[buildstream] branch master updated: .github/workflows/merge.yml: Fix publishing of docs tarball.

[tv...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tvb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/buildstream.git


The following commit(s) were added to refs/heads/master by this push:
     new 20add16  .github/workflows/merge.yml: Fix publishing of docs tarball.
20add16 is described below

commit 20add1616385785a0a42ab921cd11647bb4458e9
Author: Tristan van Berkom <tr...@codethink.co.uk>
AuthorDate: Tue Jan 12 16:43:47 2021 +0900

    .github/workflows/merge.yml: Fix publishing of docs tarball.
    
    Previous iteration had a permission error when moving the tarball
    into the built docs which were built under docker, instead just
    collect it separately and copy it over in the publishing stage.
---
 .github/workflows/merge.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index ba4942b..9facf26 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -34,13 +34,14 @@ jobs:
         # Include a tarball in the published docs, allowing for
         # easy re-publishing of master docs on docs.buildstream.build
         tar -C doc/build/html -zcf docs.tgz .
-        mv docs.tgz doc/build/html
 
     - name: Upload artifacts
       uses: actions/upload-artifact@v2
       with:
         name: docs
-        path: doc/build/html
+        path: |
+          doc/build/html
+          docs.tgz
 
   publish:
     needs: build
@@ -67,7 +68,8 @@ jobs:
         # it will interfere with the rendering of the site.
         #
         mkdir -p pages/docs
-        cp -a docs/* pages/docs/
+        cp -a docs/doc/build/html/* pages/docs/
+        cp -a docs/docs.tgz pages/docs/
         touch pages/docs/.nojekyll
 
         cd pages/