Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Wazuh and platform versions for v4.4.1 #5347

Merged
merged 6 commits into from
Mar 31, 2023

Conversation

AlexRuiz7
Copy link
Member

@AlexRuiz7 AlexRuiz7 commented Mar 31, 2023

Description

This pull request prepares the app for Wazuh 4.4.1, which will work with Indexer 2.6.0.

The tag tool has been improved to catch up with the original tool from our Splunk repo.

Issues Resolved

#5342

Evidence

Will be done later in another issue.

Test

Will be done later in another issue.

Check List

  • All tests pass
    • yarn test:jest
  • New functionality includes testing.
  • New functionality has been documented.
  • Update CHANGELOG.md
  • Commits are signed per the DCO using --signoff

@AlexRuiz7 AlexRuiz7 requested a review from a team as a code owner March 31, 2023 10:17
@AlexRuiz7 AlexRuiz7 self-assigned this Mar 31, 2023
@AlexRuiz7 AlexRuiz7 linked an issue Mar 31, 2023 that may be closed by this pull request
3 tasks
yenienserrano
yenienserrano previously approved these changes Mar 31, 2023
Copy link
Member

@yenienserrano yenienserrano left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@github-actions
Copy link
Contributor

Code coverage (Jest) % values
Statements 8.77% ( 3240 / 36925 )
Branches 4.49% ( 1287 / 28640 )
Functions 7.63% ( 698 / 9146 )
Lines 8.83% ( 3125 / 35360 )

@AlexRuiz7 AlexRuiz7 merged commit d69d840 into 4.4-2.4-wzd Mar 31, 2023
@AlexRuiz7 AlexRuiz7 deleted the 5342-prepare-4.4.1-release branch March 31, 2023 12:54
@github-actions
Copy link
Contributor

The backport to 4.4-7.16 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-4.4-7.16 4.4-7.16
# Navigate to the new working tree
cd .worktrees/backport-4.4-7.16
# Create a new branch
git switch --create backport-5347-to-4.4-7.16
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 d69d840c0fbc2c1c76a8f0e18b73a0c2f919ac96
# Push it to GitHub
git push --set-upstream origin backport-5347-to-4.4-7.16
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-4.4-7.16

Then, create a pull request where the base branch is 4.4-7.16 and the compare/head branch is backport-5347-to-4.4-7.16.

@github-actions
Copy link
Contributor

The backport to 4.4-7.10 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-4.4-7.10 4.4-7.10
# Navigate to the new working tree
cd .worktrees/backport-4.4-7.10
# Create a new branch
git switch --create backport-5347-to-4.4-7.10
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 d69d840c0fbc2c1c76a8f0e18b73a0c2f919ac96
# Push it to GitHub
git push --set-upstream origin backport-5347-to-4.4-7.10
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-4.4-7.10

Then, create a pull request where the base branch is 4.4-7.10 and the compare/head branch is backport-5347-to-4.4-7.10.

AlexRuiz7 added a commit that referenced this pull request Mar 31, 2023
* Prepare the app for Wazuh 4.4.1

* Revert dry-run option from the tagging tool

* Revert dry-run option from the tagging tool

* Bump node version to 14.20.1

Fix the tag script

* Fix tag.py again

* Revert changes to .nvmrc

(cherry picked from commit d69d840)
AlexRuiz7 added a commit that referenced this pull request Mar 31, 2023
* Prepare the app for Wazuh 4.4.1

* Revert dry-run option from the tagging tool

* Revert dry-run option from the tagging tool

* Bump node version to 14.20.1

Fix the tag script

* Fix tag.py again

* Revert changes to .nvmrc

(cherry picked from commit d69d840)
AlexRuiz7 added a commit that referenced this pull request Mar 31, 2023
Bump Wazuh and platform versions for v4.4.1 (#5347)

* Prepare the app for Wazuh 4.4.1

* Revert dry-run option from the tagging tool

* Revert dry-run option from the tagging tool

* Bump node version to 14.20.1

Fix the tag script

* Fix tag.py again

* Revert changes to .nvmrc

(cherry picked from commit d69d840)
AlexRuiz7 added a commit that referenced this pull request Mar 31, 2023
Bump Wazuh and platform versions for v4.4.1 (#5347)

* Prepare the app for Wazuh 4.4.1

* Revert dry-run option from the tagging tool

* Revert dry-run option from the tagging tool

* Bump node version to 14.20.1

Fix the tag script

* Fix tag.py again

* Revert changes to .nvmrc

(cherry picked from commit d69d840)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Prepare the release 4.4.1
2 participants