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

Merge branch 'master' into 3.0

Browse Source
This commit is contained in:
grossmj 2020-10-24 17:08:19 +10:30
commit d6a65883ee
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,10 +15,15 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
fetch-depth: 0 fetch-depth: 0
ref: "3.0" ref: "gh-pages"
- uses: actions/setup-python@v2 - uses: actions/setup-python@v2
with: with:
python-version: 3.6 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 - name: Install dependencies
run: | run: |
python -m pip install --upgrade pip python -m pip install --upgrade pip
@ -32,11 +37,7 @@ 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"
git checkout gh-pages
git merge 3.0 -X theirs
git push git push