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

tvb pushed a commit to branch tristan/test-docs
in repository https://gitbox.apache.org/repos/asf/buildstream.git

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

    Testing docs publishing in docs/ subdir
---
 .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 3fb50e1..e91c2ed 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -6,7 +6,8 @@ env:
 
 on:
   push:
-    branches:
+    branches-ignore:
+    - gh-pages
     - master
 
 jobs:
@@ -62,8 +63,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