mirror of
https://github.com/GNS3/gns3-server.git
synced 2026-11-04 22:41:12 +02:00
Set ident for merge.
This commit is contained in:
1 parent
ca69b01d11
commit
5743d47327
1 file changed
+2
-2
@@ -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"
|
||||
|
||||
Reference in new issue
Block a user