|
|
@ -21,6 +21,8 @@ jobs:
|
|
|
|
python-version: 3.6
|
|
|
|
python-version: 3.6
|
|
|
|
- name: Merge changes from 3.0 branch
|
|
|
|
- name: Merge changes from 3.0 branch
|
|
|
|
run: |
|
|
|
|
run: |
|
|
|
|
|
|
|
|
git config user.name github-actions
|
|
|
|
|
|
|
|
git config user.email github-actions@github.com
|
|
|
|
git merge origin/3.0 -X theirs
|
|
|
|
git merge origin/3.0 -X theirs
|
|
|
|
- name: Install dependencies
|
|
|
|
- name: Install dependencies
|
|
|
|
run: |
|
|
|
|
run: |
|
|
|
@ -35,8 +37,6 @@ jobs:
|
|
|
|
python3 publish_api_documentation.py
|
|
|
|
python3 publish_api_documentation.py
|
|
|
|
- name: Publish the API documentation
|
|
|
|
- name: Publish the API documentation
|
|
|
|
run: |
|
|
|
|
run: |
|
|
|
|
git config user.name github-actions
|
|
|
|
|
|
|
|
git config user.email github-actions@github.com
|
|
|
|
|
|
|
|
git add docs
|
|
|
|
git add docs
|
|
|
|
git status
|
|
|
|
git status
|
|
|
|
git commit -m "Publish API documentation"
|
|
|
|
git commit -m "Publish API documentation"
|
|
|
|