[buildstream] branch tristan/test-docs updated (3ff9f12 -> c2714b3)

[tv...@apache.org]

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

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


 discard 3ff9f12  Testing docs publishing in docs/ subdir
     new c2714b3  Testing docs publishing in docs/ subdir

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (3ff9f12)
            \
             N -- N -- N   refs/heads/tristan/test-docs (c2714b3)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .github/workflows/merge.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[buildstream] 01/01: Testing docs publishing in docs/ subdir

[tv...@apache.org]

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 c2714b36ec5fcd91623369092cd1f3f4f50a06e4
Author: Tristan van Berkom <tr...@codethink.co.uk>
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..2bcd502 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 .