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

Fix add mac os version #4867

Merged
merged 4 commits into from
Nov 15, 2022
Merged

Fix add mac os version #4867

merged 4 commits into from
Nov 15, 2022

Conversation

chantal-kelm
Copy link
Member

@chantal-kelm chantal-kelm commented Nov 15, 2022

Description

Add macOS version to wizard deploy agent

Issues Resolved

[#4204][#4178]

Evidence

image

Steps to test:

*Go to the Agents tab
*Click on the 'Deploy new agent' button.
*Verify that the macOS Ventura version is displayed.

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

@chantal-kelm chantal-kelm self-assigned this Nov 15, 2022
@chantal-kelm chantal-kelm requested a review from a team as a code owner November 15, 2022 11:18
@chantal-kelm chantal-kelm changed the base branch from master to 4.4-7.10 November 15, 2022 11:22
Tostti
Tostti previously approved these changes Nov 15, 2022
Copy link
Member

@Tostti Tostti left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Member

@asteriscos asteriscos left a comment

Choose a reason for hiding this comment

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

When I select any macOS it still asks for an architecture.
Peek 2022-11-15 12-35

@github-actions
Copy link
Contributor

Code coverage (Jest) % values
Statements 8.69% ( 3209 / 36947 )
Branches 4.43% ( 1271 / 28675 )
Functions 7.59% ( 696 / 9165 )
Lines 8.75% ( 3096 / 35367 )

Copy link
Member

@Tostti Tostti left a comment

Choose a reason for hiding this comment

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

Tested latest changes

Copy link
Member

@asteriscos asteriscos left a comment

Choose a reason for hiding this comment

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

CR: ✔️
Test: ✔️
screencapture-localhost-5601-app-wazuh-2022-11-15-12_53_32

@chantal-kelm chantal-kelm merged commit c64a077 into 4.4-7.10 Nov 15, 2022
@chantal-kelm chantal-kelm deleted the fix-add-macOS-version branch November 15, 2022 12:55
@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-4867-to-4.4-7.16
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 c64a0775badac71185baf2f36267e5cb8f0f8d9f
# Push it to GitHub
git push --set-upstream origin backport-4867-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-4867-to-4.4-7.16.

github-actions bot pushed a commit that referenced this pull request Nov 15, 2022
* fix-add macOS version

* CHANGELOG

* CHANGELOG

* fix architecture

(cherry picked from commit c64a077)
chantal-kelm added a commit that referenced this pull request Nov 15, 2022
Fix add mac os version (#4867)

* fix-add macOS version

* CHANGELOG

* CHANGELOG

* fix architecture

(cherry picked from commit c64a077)

Co-authored-by: Chantal Belén kelm <99441266+chantal-kelm@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants