arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-28 11:18:11 +00:00
Code Issues Releases Wiki Activity

Set ident for merge.

Browse Source
This commit is contained in:
grossmj 2020-10-24 17:04:42 +10:30
parent ca69b01d11
commit 5743d47327
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/publish_api_documentation.yml vendored
View File

@ -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"