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 0470fdc  .github/workflows/merge.yml: Publish docs in the docs/ 
subdirectory
0470fdc is described below

commit 0470fdc0812c533dcca21fe53e419ca41db9f598
Author: Tristan van Berkom <[email protected]>
AuthorDate: Tue Jan 5 00:20:48 2021 +0900

    .github/workflows/merge.yml: Publish docs in the docs/ subdirectory
    
    This commit publishes docs into the docs subdirectory of the gh-pages
    branch, it also adds a tarball of the docs themselves to the github.io
    site so that it can be easily downloaded and republished on
    docs.buildstream.build.
---
 .github/workflows/merge.yml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index 3fb50e1..a663217 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -30,7 +30,11 @@ jobs:
             --workdir /__w/buildstream/buildstream \
             $CI_IMAGE \
             tox -e docs
+
+       # 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
@@ -62,8 +66,9 @@ jobs:
         # that we disable GitHub's jekyll by creating the .nojekyll file, 
otherwise
         # it will interfere with the rendering of the site.
         #
-        cp -a docs/* pages/
-        touch pages/.nojekyll
+        mkdir -p pages/docs
+        cp -a docs/* pages/docs/
+        touch pages/docs/.nojekyll
 
         cd pages/
         git add .

Reply via email to