NgTech-LTD/gns3-server
2
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-01-19 07:53:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 2.2

Browse Source
This commit is contained in:
grossmj 2023-09-19 20:04:15 +07:00
commit a96a82821c
2 changed files with 6 additions and 9 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

@ -12,11 +12,11 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
with: with:
fetch-depth: 0 fetch-depth: 0
ref: "gh-pages" ref: "gh-pages"
- uses: actions/setup-python@v2 - uses: actions/setup-python@v3
with: with:
python-version: 3.7 python-version: 3.7
- name: Merge changes from 3.0 branch - name: Merge changes from 3.0 branch
@ -24,13 +24,10 @@ jobs:
git config user.name github-actions git config user.name github-actions
git config user.email github-actions@github.com 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 GNS3 server and dependencies
run: | run: |
python -m pip install --upgrade pip python -m pip install --upgrade pip
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi python -m pip install .
- name: Install GNS3 server
run: |
python setup.py install
- name: Generate the API documentation - name: Generate the API documentation
run: | run: |
cd scripts cd scripts

4
gns3server/appliances/openwrt.gns3a
View File

@ -170,7 +170,7 @@
{ {
"filename": "openwrt-18.06.5-x86-64-combined-ext4.img", "filename": "openwrt-18.06.5-x86-64-combined-ext4.img",
"version": "18.06.5", "version": "18.06.5",
"md5sum": "6fce24c15f0bc75af16c133b839aea30", "md5sum": "a0f72f4e75e15bef06396fa31eb1bc82",
"filesize": 285736960, "filesize": 285736960,
"download_url": "https://downloads.openwrt.org/releases/18.06.5/targets/x86/64/", "download_url": "https://downloads.openwrt.org/releases/18.06.5/targets/x86/64/",
"direct_download_url": "https://downloads.openwrt.org/releases/18.06.5/targets/x86/64/openwrt-18.06.5-x86-64-combined-ext4.img.gz", "direct_download_url": "https://downloads.openwrt.org/releases/18.06.5/targets/x86/64/openwrt-18.06.5-x86-64-combined-ext4.img.gz",
@ -179,7 +179,7 @@
{ {
"filename": "openwrt-18.06.2-x86-64-combined-ext4.img", "filename": "openwrt-18.06.2-x86-64-combined-ext4.img",
"version": "18.06.2", "version": "18.06.2",
"md5sum": "d112cd432bf51e2ddadbf9513f272fd9", "md5sum": "9996a3c070b3e2ea582d28293bd78055",
"filesize": 285736960, "filesize": 285736960,
"download_url": "https://downloads.openwrt.org/releases/18.06.2/targets/x86/64/", "download_url": "https://downloads.openwrt.org/releases/18.06.2/targets/x86/64/",
"direct_download_url": "https://downloads.openwrt.org/releases/18.06.2/targets/x86/64/openwrt-18.06.2-x86-64-combined-ext4.img.gz", "direct_download_url": "https://downloads.openwrt.org/releases/18.06.2/targets/x86/64/openwrt-18.06.2-x86-64-combined-ext4.img.gz",