From 5743d473275c77f4f9eb2429b57866601fa0271d Mon Sep 17 00:00:00 2001 From: grossmj Date: Sat, 24 Oct 2020 17:04:42 +1030 Subject: [PATCH] Set ident for merge. --- .github/workflows/publish_api_documentation.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish_api_documentation.yml b/.github/workflows/publish_api_documentation.yml index 59dc397d..348ebe16 100644 --- a/.github/workflows/publish_api_documentation.yml +++ b/.github/workflows/publish_api_documentation.yml @@ -21,6 +21,8 @@ jobs: python-version: 3.6 - name: Merge changes from 3.0 branch run: | + git config user.name github-actions + git config user.email github-actions@github.com git merge origin/3.0 -X theirs - name: Install dependencies run: | @@ -35,8 +37,6 @@ jobs: python3 publish_api_documentation.py - name: Publish the API documentation run: | - git config user.name github-actions - git config user.email github-actions@github.com git add docs git status git commit -m "Publish API documentation"