updated docs generator

forntoh · Apr 29, 2021 · e998a85 · e998a85
1 parent c3878f3
commit e998a85
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml
@@ -14,15 +14,20 @@ jobs:
         uses: actions/setup-node@v2
         with:
           node-version: '14'
-
+
+      - name: Merge master -> gh-pages
+        uses: devmasx/[email protected]
+        with:
+          type: now
+          from_branch: master
+          target_branch: gh-pages
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Checkout gh-pages branch
         uses: actions/checkout@v2
         with:
           ref: gh-pages
 
-      - name: Merge changes from master
-        run: git merge origin/master
-
       - name: Add examples to docs
         run: |
           for FILE in examples/*/*.md; do TMP=$FILE; TMP=${TMP//examples\//}; TMP=${TMP//\/README/}; cp $FILE 'docs/examples/'"$TMP"; done