From 0ab31df9d25f970c6378dd4d385c8be0ed335d54 Mon Sep 17 00:00:00 2001 From: Kinplemelon Date: Tue, 6 Aug 2024 09:32:17 +0800 Subject: [PATCH 1/2] chore(dashboard): bump dashboard version to v1.9.2-beta.1 & e1.7.2-beta.7 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 41d4bd5b6..f390f600d 100644 --- a/Makefile +++ b/Makefile @@ -10,8 +10,8 @@ include env.sh # Dashboard version # from https://github.com/emqx/emqx-dashboard5 -export EMQX_DASHBOARD_VERSION ?= v1.9.1 -export EMQX_EE_DASHBOARD_VERSION ?= e1.7.1 +export EMQX_DASHBOARD_VERSION ?= v1.9.2-beta.1 +export EMQX_EE_DASHBOARD_VERSION ?= e1.7.2-beta.7 export EMQX_RELUP ?= true export EMQX_REL_FORM ?= tgz From dbbd5e1458594c9625a517c9230ab72f5d8da7d0 Mon Sep 17 00:00:00 2001 From: Kinplemelon Date: Tue, 6 Aug 2024 09:33:20 +0800 Subject: [PATCH 2/2] ci: update emqx docs link in dashboard --- scripts/ui-tests/dashboard_test.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/scripts/ui-tests/dashboard_test.py b/scripts/ui-tests/dashboard_test.py index c349739b6..356432b8e 100644 --- a/scripts/ui-tests/dashboard_test.py +++ b/scripts/ui-tests/dashboard_test.py @@ -131,10 +131,7 @@ def test_docs_link(driver, dashboard_url): # it's v5.x in the url emqx_version = 'v' + emqx_version - if prefix == 'e': - docs_base_url = "https://docs.emqx.com/en/enterprise" - else: - docs_base_url = "https://docs.emqx.com/en/emqx" + docs_base_url = "https://docs.emqx.com/en/emqx" docs_url = f"{docs_base_url}/{emqx_version}" xpath = f"//div[@id='app']//div[@class='nav-header']//a[@href[starts-with(.,'{docs_url}')]]"