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

feat: enable windows and macos builds #1108

Merged
merged 16 commits into from
Oct 20, 2022
Merged

feat: enable windows and macos builds #1108

merged 16 commits into from
Oct 20, 2022

Conversation

derek-ho
Copy link
Collaborator

@derek-ho derek-ho commented Oct 11, 2022

Description

Enable builds on windows and macos

Issues Resolved

#160 #161

Check List

  • New functionality includes testing.
    • All tests pass, including unit test, integration test and doctest
  • New functionality has been documented.
    • New functionality has javadoc added
    • New functionality has user manual doc added
  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Signed-off-by: Derek Ho <dxho@amazon.com>
Signed-off-by: Derek Ho <dxho@amazon.com>
Signed-off-by: Derek Ho <dxho@amazon.com>
Signed-off-by: Derek Ho <dxho@amazon.com>
Signed-off-by: Derek Ho <dxho@amazon.com>
Signed-off-by: Derek Ho <dxho@amazon.com>
@derek-ho derek-ho requested a review from a team as a code owner October 11, 2022 15:01
@derek-ho
Copy link
Collaborator Author

derek-ho commented Oct 11, 2022

Addresses #160, #161

anirudha
anirudha previously approved these changes Oct 11, 2022
joshuali925
joshuali925 previously approved these changes Oct 11, 2022
Copy link
Member

@joshuali925 joshuali925 left a comment

Choose a reason for hiding this comment

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

np: the artifacts should be the same for all platforms right?

cd OpenSearch-Dashboards/plugins/dashboards-observability
yarn osd bootstrap

# TODO remove hard coded version when observability is ready
Copy link
Member

Choose a reason for hiding this comment

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

Let's remove the comment if not used.

cd OpenSearch-Dashboards/plugins/dashboards-observability
yarn osd bootstrap

# TODO remove hard coded version when observability is ready
Copy link
Member

Choose a reason for hiding this comment

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

same here.

Signed-off-by: Derek Ho <dxho@amazon.com>
@derek-ho derek-ho dismissed stale reviews from joshuali925 and anirudha via 84bfc54 October 12, 2022 01:31
@codecov-commenter
Copy link

codecov-commenter commented Oct 12, 2022

Codecov Report

Merging #1108 (d979ce2) into main (8e6c6ce) will increase coverage by 0.40%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##               main    #1108      +/-   ##
============================================
+ Coverage     53.12%   53.53%   +0.40%     
  Complexity      291      291              
============================================
  Files           280      279       -1     
  Lines          9428     9439      +11     
  Branches       2208     2209       +1     
============================================
+ Hits           5009     5053      +44     
+ Misses         4249     4216      -33     
  Partials        170      170              
Flag Coverage Δ
dashboards-observability 47.58% <ø> (+0.54%) ⬆️
opensearch-observability 71.87% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
...lorer/visualizations/config_panel/config_panel.tsx 67.53% <0.00%> (-1.98%) ⬇️
...anes/config_controls/config_panel_option_gauge.tsx 10.00% <0.00%> (-0.53%) ⬇️
...ashboards-observability/common/constants/shared.ts 100.00% <0.00%> (ø)
...hboards-observability/common/constants/explorer.ts 100.00% <0.00%> (ø)
...blic/components/visualizations/charts/vis_types.ts 100.00% <0.00%> (ø)
...c/components/visualizations/charts/bar/bar_type.ts 100.00% <0.00%> (ø)
...trace_analytics/requests/traces_request_handler.ts 17.82% <0.00%> (ø)
...race_analytics/components/common/plots/box_plt.tsx 67.56% <0.00%> (ø)
...tics/components/common/plots/service_map_scale.tsx 100.00% <0.00%> (ø)
...ules/visualization_flyout/visualization_flyout.tsx 42.55% <0.00%> (ø)
... and 9 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

Signed-off-by: Derek Ho <dxho@amazon.com>
Signed-off-by: Derek Ho <dxho@amazon.com>
Signed-off-by: Derek Ho <dxho@amazon.com>
Signed-off-by: Derek Ho <dxho@amazon.com>
Signed-off-by: Derek Ho <dxho@amazon.com>
Signed-off-by: Derek Ho <dxho@amazon.com>
Signed-off-by: Derek Ho <dxho@amazon.com>
Signed-off-by: Derek Ho <dxho@amazon.com>
@derek-ho derek-ho mentioned this pull request Oct 17, 2022
2 tasks
@derek-ho derek-ho mentioned this pull request Oct 17, 2022
2 tasks
- os: windows-latest
os_build_args: -x integTest -x jacocoTestReport
- os: macos-latest
os_build_args: -x integTest -x jacocoTestReport
Copy link
Member

Choose a reason for hiding this comment

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

Are integ tests failing? Please open an issue to get those to work on those OSs as well in the future.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Done #1159

Copy link
Member

@ps48 ps48 left a comment

Choose a reason for hiding this comment

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

Thanks for the changes. Let's make sure to follow on integ-tests later

@derek-ho derek-ho merged commit 363ccd4 into opensearch-project:main Oct 20, 2022
@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.3 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-1.3 1.3
# Navigate to the new working tree
cd .worktrees/backport-1.3
# Create a new branch
git switch --create backport/backport-1108-to-1.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 363ccd4946fcbb9280078e694846e9aa8a8753b0
# Push it to GitHub
git push --set-upstream origin backport/backport-1108-to-1.3
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.3

Then, create a pull request where the base branch is 1.3 and the compare/head branch is backport/backport-1108-to-1.3.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.x 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-1.x 1.x
# Navigate to the new working tree
cd .worktrees/backport-1.x
# Create a new branch
git switch --create backport/backport-1108-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 363ccd4946fcbb9280078e694846e9aa8a8753b0
# Push it to GitHub
git push --set-upstream origin backport/backport-1108-to-1.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.x

Then, create a pull request where the base branch is 1.x and the compare/head branch is backport/backport-1108-to-1.x.

derek-ho added a commit that referenced this pull request Dec 6, 2022
* feat: enable windows and macos builds (#1108)

* fix: initial code to add windows support for opensearch-observability

Signed-off-by: Derek Ho <dxho@amazon.com>

* add build for windows in dashboards-observability

Signed-off-by: Derek Ho <dxho@amazon.com>

* change windows command and add windows build for UI modules

Signed-off-by: Derek Ho <dxho@amazon.com>

* try gradlew bat for windows

Signed-off-by: Derek Ho <dxho@amazon.com>

* try to exclude tests

Signed-off-by: Derek Ho <dxho@amazon.com>

* fix jacoco

Signed-off-by: Derek Ho <dxho@amazon.com>

* do for mac and change name

Signed-off-by: Derek Ho <dxho@amazon.com>

* try to run the tests for windows and mac

Signed-off-by: Derek Ho <dxho@amazon.com>

* try to add gitattributes file

Signed-off-by: Derek Ho <dxho@amazon.com>

* add formatting rule

Signed-off-by: Derek Ho <dxho@amazon.com>

* try to enable both

Signed-off-by: Derek Ho <dxho@amazon.com>

* try to add git config to fix

Signed-off-by: Derek Ho <dxho@amazon.com>

* autocrlf false for windwos and remove comments

Signed-off-by: Derek Ho <dxho@amazon.com>

* comment out bwc tests,

Signed-off-by: Derek Ho <dxho@amazon.com>

* add line

Signed-off-by: Derek Ho <dxho@amazon.com>

* fix up using matrix and fix test

Signed-off-by: Derek Ho <dxho@amazon.com>

Signed-off-by: Derek Ho <dxho@amazon.com>
(cherry picked from commit 363ccd4)
Signed-off-by: Derek Ho <dxho@amazon.com>

* remove java 17

Signed-off-by: Derek Ho <dxho@amazon.com>

* remove -d for windows

Signed-off-by: Derek Ho <dxho@amazon.com>

* Update .github/workflows/dashboards-observability-test-and-build-workflow.yml

Signed-off-by: Derek Ho <dxho@amazon.com>

* fix fail fast

Signed-off-by: Derek Ho <dxho@amazon.com>

* try to do fix step for mac

Signed-off-by: Derek Ho <dxho@amazon.com>

* remove mac

Signed-off-by: Derek Ho <dxho@amazon.com>

Signed-off-by: Derek Ho <dxho@amazon.com>
derek-ho added a commit that referenced this pull request Dec 6, 2022
* feat: enable windows and macos builds (#1108)

* fix: initial code to add windows support for opensearch-observability

Signed-off-by: Derek Ho <dxho@amazon.com>

* add build for windows in dashboards-observability

Signed-off-by: Derek Ho <dxho@amazon.com>

* change windows command and add windows build for UI modules

Signed-off-by: Derek Ho <dxho@amazon.com>

* try gradlew bat for windows

Signed-off-by: Derek Ho <dxho@amazon.com>

* try to exclude tests

Signed-off-by: Derek Ho <dxho@amazon.com>

* fix jacoco

Signed-off-by: Derek Ho <dxho@amazon.com>

* do for mac and change name

Signed-off-by: Derek Ho <dxho@amazon.com>

* try to run the tests for windows and mac

Signed-off-by: Derek Ho <dxho@amazon.com>

* try to add gitattributes file

Signed-off-by: Derek Ho <dxho@amazon.com>

* add formatting rule

Signed-off-by: Derek Ho <dxho@amazon.com>

* try to enable both

Signed-off-by: Derek Ho <dxho@amazon.com>

* try to add git config to fix

Signed-off-by: Derek Ho <dxho@amazon.com>

* autocrlf false for windwos and remove comments

Signed-off-by: Derek Ho <dxho@amazon.com>

* comment out bwc tests,

Signed-off-by: Derek Ho <dxho@amazon.com>

* add line

Signed-off-by: Derek Ho <dxho@amazon.com>

* fix up using matrix and fix test

Signed-off-by: Derek Ho <dxho@amazon.com>

Signed-off-by: Derek Ho <dxho@amazon.com>
(cherry picked from commit 363ccd4)
Signed-off-by: Derek Ho <dxho@amazon.com>

* fix merge conflict

Signed-off-by: Derek Ho <dxho@amazon.com>

Signed-off-by: Derek Ho <dxho@amazon.com>
derek-ho added a commit that referenced this pull request Dec 22, 2022
* feat: enable windows and macos builds (#1108)

* fix: initial code to add windows support for opensearch-observability

Signed-off-by: Derek Ho <dxho@amazon.com>

* add build for windows in dashboards-observability

Signed-off-by: Derek Ho <dxho@amazon.com>

* change windows command and add windows build for UI modules

Signed-off-by: Derek Ho <dxho@amazon.com>

* try gradlew bat for windows

Signed-off-by: Derek Ho <dxho@amazon.com>

* try to exclude tests

Signed-off-by: Derek Ho <dxho@amazon.com>

* fix jacoco

Signed-off-by: Derek Ho <dxho@amazon.com>

* do for mac and change name

Signed-off-by: Derek Ho <dxho@amazon.com>

* try to run the tests for windows and mac

Signed-off-by: Derek Ho <dxho@amazon.com>

* try to add gitattributes file

Signed-off-by: Derek Ho <dxho@amazon.com>

* add formatting rule

Signed-off-by: Derek Ho <dxho@amazon.com>

* try to enable both

Signed-off-by: Derek Ho <dxho@amazon.com>

* try to add git config to fix

Signed-off-by: Derek Ho <dxho@amazon.com>

* autocrlf false for windwos and remove comments

Signed-off-by: Derek Ho <dxho@amazon.com>

* comment out bwc tests,

Signed-off-by: Derek Ho <dxho@amazon.com>

* add line

Signed-off-by: Derek Ho <dxho@amazon.com>

* fix up using matrix and fix test

Signed-off-by: Derek Ho <dxho@amazon.com>

Signed-off-by: Derek Ho <dxho@amazon.com>
(cherry picked from commit 0e65c32)
Signed-off-by: Derek Ho <dxho@amazon.com>

* remove java 17

Signed-off-by: Derek Ho <dxho@amazon.com>

* remove -d for windows

Signed-off-by: Derek Ho <dxho@amazon.com>

* Update .github/workflows/dashboards-observability-test-and-build-workflow.yml

Signed-off-by: Derek Ho <dxho@amazon.com>

* fix fail fast

Signed-off-by: Derek Ho <dxho@amazon.com>

* try to do fix step for mac

Signed-off-by: Derek Ho <dxho@amazon.com>

* remove mac

Signed-off-by: Derek Ho <dxho@amazon.com>

Signed-off-by: Derek Ho <dxho@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants