From 299934bb1e851c6fb794a9890d56f8f4d55c36d8 Mon Sep 17 00:00:00 2001 From: Kinplemelon Date: Tue, 25 Jun 2024 22:55:50 +0800 Subject: [PATCH 1/2] chore(dashboard): bump dashboard version to v1.9.1 & e1.7.1 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b73c39a11..a3ac1c0c0 100644 --- a/Makefile +++ b/Makefile @@ -20,8 +20,8 @@ endif # Dashboard version # from https://github.com/emqx/emqx-dashboard5 -export EMQX_DASHBOARD_VERSION ?= v1.9.1-beta.1 -export EMQX_EE_DASHBOARD_VERSION ?= e1.7.1-beta.1 +export EMQX_DASHBOARD_VERSION ?= v1.9.1 +export EMQX_EE_DASHBOARD_VERSION ?= e1.7.1 -include default-profile.mk PROFILE ?= emqx From 66d60d10bb7d0f8635a346bd21d9a47f53c85ffd Mon Sep 17 00:00:00 2001 From: Kinplemelon Date: Wed, 26 Jun 2024 09:51:51 +0800 Subject: [PATCH 2/2] ci(ui-tests): update link to ce version doc on the dashboard --- scripts/ui-tests/dashboard_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ui-tests/dashboard_test.py b/scripts/ui-tests/dashboard_test.py index 85d40cec8..6005a9403 100644 --- a/scripts/ui-tests/dashboard_test.py +++ b/scripts/ui-tests/dashboard_test.py @@ -118,7 +118,7 @@ def test_docs_link(driver, login, dashboard_url): if prefix == 'e': docs_base_url = "https://docs.emqx.com/en/enterprise" else: - docs_base_url = "https://www.emqx.io/docs/en" + 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}')]]"