From dd785b61cf0ea876ac51052e59a2458fd2013b1c Mon Sep 17 00:00:00 2001 From: grossmj Date: Sat, 24 Oct 2020 16:59:55 +1030 Subject: [PATCH 1/3] Work directly on gh-pages branch to generate the API documentation. --- .github/workflows/publish_api_documentation.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish_api_documentation.yml b/.github/workflows/publish_api_documentation.yml index 9f6fa41e..8447eb49 100644 --- a/.github/workflows/publish_api_documentation.yml +++ b/.github/workflows/publish_api_documentation.yml @@ -15,10 +15,13 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 0 - ref: "3.0" + ref: "gh-pages" - uses: actions/setup-python@v2 with: python-version: 3.6 + - name: Merge changes from 3.0 branch + run: | + git merge 3.0 -X theirs - name: Install dependencies run: | python -m pip install --upgrade pip @@ -37,6 +40,4 @@ jobs: git add docs git status git commit -m "Publish API documentation" - git checkout gh-pages - git merge 3.0 -X theirs git push From ca69b01d119850cd3f678eb894a86fd33a908e2d Mon Sep 17 00:00:00 2001 From: grossmj Date: Sat, 24 Oct 2020 17:02:44 +1030 Subject: [PATCH 2/3] Use origin/3.0 for merge into gh-pages branch. --- .github/workflows/publish_api_documentation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish_api_documentation.yml b/.github/workflows/publish_api_documentation.yml index 8447eb49..59dc397d 100644 --- a/.github/workflows/publish_api_documentation.yml +++ b/.github/workflows/publish_api_documentation.yml @@ -21,7 +21,7 @@ jobs: python-version: 3.6 - name: Merge changes from 3.0 branch run: | - git merge 3.0 -X theirs + git merge origin/3.0 -X theirs - name: Install dependencies run: | python -m pip install --upgrade pip From 5743d473275c77f4f9eb2429b57866601fa0271d Mon Sep 17 00:00:00 2001 From: grossmj Date: Sat, 24 Oct 2020 17:04:42 +1030 Subject: [PATCH 3/3] 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"