From a6b0f32b57e0c7a485d4c86a43ecb31236262eff Mon Sep 17 00:00:00 2001 From: Echo Nar <97153783+lethedata@users.noreply.github.com> Date: Wed, 16 Aug 2023 18:37:55 -0500 Subject: [PATCH 1/3] Hash Update openwrt.gns3a Update hashes for openwrt-18.06.5 and openwrt-18.06.2 based hashes from download links. --- gns3server/appliances/openwrt.gns3a | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gns3server/appliances/openwrt.gns3a b/gns3server/appliances/openwrt.gns3a index e6428658..b4a7a697 100644 --- a/gns3server/appliances/openwrt.gns3a +++ b/gns3server/appliances/openwrt.gns3a @@ -170,7 +170,7 @@ { "filename": "openwrt-18.06.5-x86-64-combined-ext4.img", "version": "18.06.5", - "md5sum": "6fce24c15f0bc75af16c133b839aea30", + "md5sum": "a0f72f4e75e15bef06396fa31eb1bc82", "filesize": 285736960, "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", @@ -179,7 +179,7 @@ { "filename": "openwrt-18.06.2-x86-64-combined-ext4.img", "version": "18.06.2", - "md5sum": "d112cd432bf51e2ddadbf9513f272fd9", + "md5sum": "9996a3c070b3e2ea582d28293bd78055", "filesize": 285736960, "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", From 476658b8293585bbc186b65876574fb9948bb1b3 Mon Sep 17 00:00:00 2001 From: grossmj Date: Sun, 3 Sep 2023 16:52:30 +0700 Subject: [PATCH 2/3] Update publish-api-documentation.yml --- .github/workflows/publish-api-documentation.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/publish-api-documentation.yml b/.github/workflows/publish-api-documentation.yml index 782e76fe..d27a2f68 100644 --- a/.github/workflows/publish-api-documentation.yml +++ b/.github/workflows/publish-api-documentation.yml @@ -12,11 +12,11 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 ref: "gh-pages" - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v3 with: python-version: 3.7 - name: Merge changes from 3.0 branch @@ -24,13 +24,10 @@ jobs: 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 GNS3 server and dependencies run: | python -m pip install --upgrade pip - if [ -f requirements.txt ]; then pip install -r requirements.txt; fi - - name: Install GNS3 server - run: | - python setup.py install + python -m pip install .[dev] - name: Generate the API documentation run: | cd scripts From 05ef9f2a7cbe811eae0b82f4959269050dc14294 Mon Sep 17 00:00:00 2001 From: grossmj Date: Sun, 3 Sep 2023 16:59:48 +0700 Subject: [PATCH 3/3] No need for dev dependencies --- .github/workflows/publish-api-documentation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-api-documentation.yml b/.github/workflows/publish-api-documentation.yml index d27a2f68..30beb62f 100644 --- a/.github/workflows/publish-api-documentation.yml +++ b/.github/workflows/publish-api-documentation.yml @@ -27,7 +27,7 @@ jobs: - name: Install GNS3 server and dependencies run: | python -m pip install --upgrade pip - python -m pip install .[dev] + python -m pip install . - name: Generate the API documentation run: | cd scripts