From d316ee33df0968d0b1a98f42bbe54e3d7d6a140e Mon Sep 17 00:00:00 2001 From: grossmj Date: Sat, 24 Oct 2020 15:35:53 +1030 Subject: [PATCH 1/2] Capitalize openapi tags. --- gns3server/endpoints/controller/__init__.py | 22 ++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/gns3server/endpoints/controller/__init__.py b/gns3server/endpoints/controller/__init__.py index d6e2aeab..012b8106 100644 --- a/gns3server/endpoints/controller/__init__.py +++ b/gns3server/endpoints/controller/__init__.py @@ -30,15 +30,15 @@ from . import symbols from . import templates router = APIRouter() -router.include_router(controller.router, tags=["controller"]) -router.include_router(appliances.router, prefix="/appliances", tags=["appliances"]) -router.include_router(computes.router, prefix="/computes", tags=["computes"]) -router.include_router(drawings.router, prefix="/projects/{project_id}/drawings", tags=["drawings"]) +router.include_router(controller.router, tags=["Controller"]) +router.include_router(appliances.router, prefix="/appliances", tags=["Appliances"]) +router.include_router(computes.router, prefix="/computes", tags=["Computes"]) +router.include_router(drawings.router, prefix="/projects/{project_id}/drawings", tags=["Drawings"]) router.include_router(gns3vm.router, prefix="/gns3vm", tags=["GNS3 VM"]) -router.include_router(links.router, prefix="/projects/{project_id}/links", tags=["links"]) -router.include_router(nodes.router, prefix="/projects/{project_id}/nodes", tags=["nodes"]) -router.include_router(notifications.router, prefix="/notifications", tags=["notifications"]) -router.include_router(projects.router, prefix="/projects", tags=["projects"]) -router.include_router(snapshots.router, prefix="/projects/{project_id}/snapshots", tags=["snapshots"]) -router.include_router(symbols.router, prefix="/symbols", tags=["symbols"]) -router.include_router(templates.router, tags=["templates"]) +router.include_router(links.router, prefix="/projects/{project_id}/links", tags=["Links"]) +router.include_router(nodes.router, prefix="/projects/{project_id}/nodes", tags=["Nodes"]) +router.include_router(notifications.router, prefix="/notifications", tags=["Notifications"]) +router.include_router(projects.router, prefix="/projects", tags=["Projects"]) +router.include_router(snapshots.router, prefix="/projects/{project_id}/snapshots", tags=["Snapshots"]) +router.include_router(symbols.router, prefix="/symbols", tags=["Symbols"]) +router.include_router(templates.router, tags=["Templates"]) From a6a35e7c439a5e7ff614d5964b859592f471f1c7 Mon Sep 17 00:00:00 2001 From: grossmj Date: Sat, 24 Oct 2020 15:42:44 +1030 Subject: [PATCH 2/2] Fix publish_api_documentation.yml --- .github/workflows/publish_api_documentation.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish_api_documentation.yml b/.github/workflows/publish_api_documentation.yml index d20e5f49..e448b0fb 100644 --- a/.github/workflows/publish_api_documentation.yml +++ b/.github/workflows/publish_api_documentation.yml @@ -3,8 +3,6 @@ name: publish-api-documentation on: workflow_dispatch: push: - branches: - - 3.0 tags: - v3.* @@ -36,8 +34,9 @@ jobs: run: | git config user.name github-actions git config user.email github-actions@github.com - git checkout gh-pages git add docs git status git commit -m "Publish API documentation" + git checkout gh-pages + git merge 3.0 git push