mirror of
https://github.com/GNS3/gns3-server.git
synced 2026-09-09 03:25:20 +03:00
fix: publish-api-documentation.yml
This commit is contained in:
parent
ed20118f86
commit
861b7e86ff
@ -19,11 +19,11 @@ jobs:
|
||||
- uses: actions/setup-python@v6
|
||||
with:
|
||||
python-version: 3.12
|
||||
- name: Merge changes from 3.0 branch
|
||||
- name: Merge changes from 3.1 branch
|
||||
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.1 -X theirs
|
||||
- name: Install GNS3 server and dependencies
|
||||
run: |
|
||||
python -m pip install --upgrade pip
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user