infra: merge in master during api docs build (langchain-ai#17494)

octoml · Feb 14, 2024 · 1aeb52c · 1aeb52c
1 parent 54373fb
commit 1aeb52c
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/.github/workflows/api_doc_build.yml b/.github/workflows/api_doc_build.yml
@@ -16,6 +16,16 @@ jobs:
         with:
           ref: bagatur/api_docs_build
 
+      - name: Set Git config
+        run: |
+          git config --local user.email "[email protected]"
+          git config --local user.name "Github Actions"
+
+      - name: Merge master
+        run: | 
+          git fetch origin master
+          git merge origin/master -m "Merge master" --allow-unrelated-histories -X theirs
+
       - name: Set up Python ${{ env.PYTHON_VERSION }} + Poetry ${{ env.POETRY_VERSION }}
         uses: "./.github/actions/poetry_setup"
         with: