From 353004b3a6d8e75a9b18247cefcca5a4e321f3d5 Mon Sep 17 00:00:00 2001 From: Nicolas Date: Thu, 29 Aug 2024 09:47:13 -0300 Subject: [PATCH 1/2] Change build number generation --- src/dev/build/lib/config.ts | 2 +- src/dev/build/tasks/create_package_json_task.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dev/build/lib/config.ts b/src/dev/build/lib/config.ts index c182b2617dad..e48cac508d8f 100644 --- a/src/dev/build/lib/config.ts +++ b/src/dev/build/lib/config.ts @@ -55,7 +55,7 @@ interface Package { workspaces: { packages: string[]; }; - wazuh: { version: string }; + wazuh: { version: string; revision: string }; [key: string]: unknown; } diff --git a/src/dev/build/tasks/create_package_json_task.ts b/src/dev/build/tasks/create_package_json_task.ts index 7b8d2a311a0b..0c795da6e13e 100644 --- a/src/dev/build/tasks/create_package_json_task.ts +++ b/src/dev/build/tasks/create_package_json_task.ts @@ -46,7 +46,7 @@ export const CreatePackageJson: Task = { version: config.getBuildVersion(), branch: pkg.branch, build: { - number: config.getBuildNumber(), + number: pkg.wazuh.version.replace(/\./g, '') + pkg.wazuh.revision, sha: config.getBuildSha(), distributable: true, release: config.isRelease, From bdc5de19dfd0496f59ddd6e0ecfc663f24204c9a Mon Sep 17 00:00:00 2001 From: Nicolas Date: Thu, 29 Aug 2024 10:12:50 -0300 Subject: [PATCH 2/2] Update changelog --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e78b68542ab..7e85f9a438a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,8 @@ All notable changes to the Wazuh app project will be documented in this file. - Changed default theme [#174](https://github.com/wazuh/wazuh-dashboard/pull/174) - Changed default logos and main menu app categories [141](https://github.com/wazuh/wazuh-dashboard/pull/141) -- Changed default value of useExpandedHeader to false. [#247](https://github.com/wazuh/wazuh-dashboard/pull/247) +- Changed default value of useExpandedHeader to false [#247](https://github.com/wazuh/wazuh-dashboard/pull/247) +- Changed build number to match the Wazuh standard [#284](https://github.com/wazuh/wazuh-dashboard/pull/284) ### Removed