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.

Sign up for GitHub

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
3d83c5c
fix: initial code to add windows support for opensearch-observability
derek-ho Oct 10, 2022
fe1667d
add build for windows in dashboards-observability
derek-ho Oct 10, 2022
a362fdd
change windows command and add windows build for UI modules
derek-ho Oct 10, 2022
3a4646f
try gradlew bat for windows
derek-ho Oct 10, 2022
9881c29
try to exclude tests
derek-ho Oct 11, 2022
454362e
fix jacoco
derek-ho Oct 11, 2022
e468701
do for mac and change name
derek-ho Oct 11, 2022
84bfc54
try to run the tests for windows and mac
derek-ho Oct 12, 2022
3ebd477
try to add gitattributes file
derek-ho Oct 12, 2022
58295af
add formatting rule
derek-ho Oct 12, 2022
541bfef
try to enable both
derek-ho Oct 12, 2022
fb041f9
try to add git config to fix
derek-ho Oct 12, 2022
d979ce2
autocrlf false for windwos and remove comments
derek-ho Oct 13, 2022
d2a4731
comment out bwc tests,
derek-ho Oct 13, 2022
6ec30be
add line
derek-ho Oct 13, 2022
76c9a1f
fix up using matrix and fix test
derek-ho Oct 13, 2022
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
13 changes: 7 additions & 6 deletions .github/workflows/dashboards-observability-test-and-build-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@ env:
jobs:

build:

runs-on: ubuntu-latest
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
runs-on: ${{ matrix.os }}

steps:
- name: Checkout Plugin
Expand Down Expand Up @@ -57,13 +59,13 @@ jobs:
yarn test --coverage

- name: Upload coverage
if: ${{ matrix.os == 'ubuntu-latest' }}
uses: codecov/codecov-action@v1
with:
flags: dashboards-observability
directory: ./OpenSearch-Dashboards/plugins/dashboards-observability
token: ${{ secrets.CODECOV_TOKEN }}

# TODO remove hard coded version when observability is ready
- name: Build Artifact
run: |
cd OpenSearch-Dashboards/plugins/dashboards-observability
Expand All @@ -73,6 +75,5 @@ jobs:
- name: Upload Artifact
uses: actions/upload-artifact@v1
with:
name: dashboards-observability
path: ./OpenSearch-Dashboards/plugins/dashboards-observability/build

name: dashboards-observability-${{ matrix.os }}
path: ./OpenSearch-Dashboards/plugins/dashboards-observability/build
24 changes: 16 additions & 8 deletions .github/workflows/opensearch-observability-test-and-build-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,18 @@ on: [pull_request, push]

jobs:
build:
env:
BUILD_ARGS: ${{ matrix.os_build_args }}
strategy:
matrix:
java:
- 11
- 17

runs-on: ubuntu-latest
java: [11, 17]
os: [ubuntu-latest, windows-latest, macos-latest]
include:
- 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

runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v1
Expand All @@ -21,6 +26,8 @@ jobs:
java-version: ${{ matrix.java }}

- name: Run Backwards Compatibility Tests
# Temporarily only do this for linux
if: ${{ matrix.os == 'ubuntu-latest' }}
run: |
cd opensearch-observability
echo "Running backwards compatibility tests ..."
Expand All @@ -29,9 +36,10 @@ jobs:
- name: Build with Gradle
run: |
cd opensearch-observability
./gradlew build
./gradlew build ${{ env.BUILD_ARGS }}

- name: Upload coverage
if: ${{ matrix.os == 'ubuntu-latest' }}
uses: codecov/codecov-action@v1
with:
flags: opensearch-observability
Expand All @@ -46,5 +54,5 @@ jobs:
- name: Upload Artifacts
uses: actions/upload-artifact@v1
with:
name: opensearch-observability
path: opensearch-observability-builds
name: opensearch-observability-${{ matrix.os }}
path: opensearch-observability-builds
3 changes: 1 addition & 2 deletions dashboards-observability/public/components/event_analytics/explorer/no_results.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ export const NoResults = () => {
<p>
<FormattedMessage
id="discover.noResults.queryMayNotMatchTitle"
defaultMessage="Your query may not match anything in the current time range, or there may not be any data at all in
the currently selected time range. Try change time range, query filters or choose different time fields"
defaultMessage="Your query may not match anything in the current time range, or there may not be any data at all in the currently selected time range. Try change time range, query filters or choose different time fields"
/>
</p>
</EuiText>
Expand Down