[buildstream-plugins] branch master updated: Use docs subfolder for gh-pages deployment

[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-plugins.git


The following commit(s) were added to refs/heads/master by this push:
     new 12c1d2c  Use docs subfolder for gh-pages deployment
     new 399ecbf  Merge pull request #24 from wsalmonct/willsalmon/gh-pages
12c1d2c is described below

commit 12c1d2cd9d007d6838541e034e384ca085d0efe6
Author: William Salmon <wi...@codethink.co.uk>
AuthorDate: Wed Aug 10 16:46:22 2022 +0100

    Use docs subfolder for gh-pages deployment
---
 .asf.yaml                   | 2 +-
 .github/workflows/merge.yml | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index 32388ea..5e8e641 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -36,4 +36,4 @@ github:
 
   # Enable pages publishing
   ghp_branch: gh-pages
-  ghp_path: ~
+  ghp_path: /docs
diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index 0921a0f..4627d75 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -66,14 +66,15 @@ jobs:
         #
         cd pages/
         git reset --hard GH_PAGES_FIRST_COMMIT
-
+        mkdir docs
         # Copy the docs asset over and overwrite the orphan gh-pages branch, ensure
         # that we disable GitHub's jekyll by creating the .nojekyll file, otherwise
         # it will interfere with the rendering of the site.
         #
-        cp -a ../docs/doc/build/html/* .
-        cp -a ../docs/docs.tgz .
+        cp -a ../docs/doc/build/html/* docs
+        cp -a ../docs/docs.tgz docs
         touch .nojekyll
+        touch docs/.nojekyll
 
         git add .
         git config --local user.email "merge-ci@ponyland"