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

Merge 4.5.0-7.10 into 4.5.1-7.10 #5694

Merged
merged 5 commits into from
Jul 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .github/workflows/unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,6 @@ on:
options:
- 'yarn test:jest'
pull_request:
branches:
- 'master'
- '[345].[0-9]+' # Minor branches
- '[345].[0-9]+.[0-9]+' # Patch branches
- '[345].[0-9]+.[0-9]+-7.[0-9]+' # Minor branches - Kibana

jobs:
# Run unit tests with Jest
Expand Down
4 changes: 1 addition & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,6 @@ typings/
target/
build/

yarn.lock

cypress/node_modules/
cypress/.idea/
cypress/cypress.env.json
Expand All @@ -84,4 +82,4 @@ cypress/cookies.json
public/assets/custom/*

# Mac files
.DS_Store
.DS_Store
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@ All notable changes to the Wazuh app project will be documented in this file.

- Support for Wazuh 4.5.0

## Wazuh v4.4.5 - Kibana 7.10.2, 7.16.x, 7.17.x - Revision 02

### Added

- Support for Wazuh 4.4.5

## Wazuh v4.4.4 - Kibana 7.10.2, 7.16.x, 7.17.x - Revision 01


Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "4.5.1",
"revision": "01",
"stage": "stable",
"commit": "7489f9237",
"commit": "3d1f43450",
"pluginPlatform": {
"version": "7.10.2"
},
Expand Down
4 changes: 2 additions & 2 deletions scripts/tag.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# Wazuh version: major.minor.patch
version = '4.5.1'
# App's revision number (previous rev + 1)
revision = '01'
revision = '02'
# One of 'pre-alpha', 'alpha', 'beta', 'release-candidate', 'stable'
stage = 'alpha'
# Tag suffix. Usually set to stage + stage iteration.
Expand All @@ -30,7 +30,7 @@
TAGS_FILE = 'tags.log'
# Global variable. Will be set later
branch = None
minor = ".".join(version.split('.')[:2])
minor = version

# Supported versions of Kibana
kbn_versions = [
Expand Down
Loading