fixed docs generator action

forntoh · Apr 30, 2021 · e435889 · e435889
1 parent e998a85
commit e435889
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml
@@ -15,19 +15,18 @@ jobs:
         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 master -> gh-pages
+        run: |
+          git config user.name github-actions
+          git config user.email [email protected]
+          git fetch origin
+          git merge origin/master --strategy-option theirs --allow-unrelated-histories
+
       - 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
@@ -47,8 +46,6 @@ jobs:
 
       - name: Commit changes
         run: |
-          git config user.name github-actions
-          git config user.email [email protected]
           git add .
           git commit -m "Generated docs"