[buildstream] 18/18: .github/workflows/merge.yml: Generate the gh-pages branch with .nojekyll

[tv...@apache.org]

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

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

commit 33aae132aefc69fc6928690e5e050746da2e7668
Author: Tristan van Berkom <tr...@codethink.co.uk>
AuthorDate: Fri Oct 16 17:29:56 2020 +0900

    .github/workflows/merge.yml: Generate the gh-pages branch with .nojekyll
    
    This disables the jekyll on GitHub which interferes with the proper
    rendering of the site.
---
 .github/workflows/merge.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index c63f380..3fb50e1 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -57,7 +57,14 @@ jobs:
 
     - name: Update repo
       run: |
+
+        # 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/* pages/
+        touch pages/.nojekyll
+
         cd pages/
         git add .
         git config --local user.email "merge-ci@ponyland"