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

Jump to bottom

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 7 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
113 changes: 111 additions & 2 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 @@ -10,7 +10,7 @@ env:

jobs:

build:
linux-build:

runs-on: ubuntu-latest

Expand Down Expand Up @@ -73,6 +73,115 @@ jobs:
- name: Upload Artifact
uses: actions/upload-artifact@v1
with:
name: dashboards-observability
name: dashboards-observability-ubuntu
path: ./OpenSearch-Dashboards/plugins/dashboards-observability/build

windows-build:

runs-on: windows-latest

steps:
- name: Checkout Plugin
uses: actions/checkout@v1

- name: Checkout OpenSearch Dashboards
uses: actions/checkout@v2
with:
repository: opensearch-project/OpenSearch-Dashboards
ref: ${{ env.OPENSEARCH_VERSION }}
path: OpenSearch-Dashboards

- name: Get node and yarn versions
id: versions_step
run: |
echo "::set-output name=node_version::$(node -p "(require('./OpenSearch-Dashboards/package.json').engines.node).match(/[.0-9]+/)[0]")"
echo "::set-output name=yarn_version::$(node -p "(require('./OpenSearch-Dashboards/package.json').engines.yarn).match(/[.0-9]+/)[0]")"

- name: Setup node
uses: actions/setup-node@v1
with:
node-version: ${{ steps.versions_step.outputs.node_version }}
registry-url: 'https://registry.npmjs.org'

- name: Install correct yarn version for OpenSearch Dashboards
run: |
npm uninstall -g yarn
echo "Installing yarn ${{ steps.versions_step.outputs.yarn_version }}"
npm i -g yarn@${{ steps.versions_step.outputs.yarn_version }}

- name: Move Observability to Plugins Dir
run: mv dashboards-observability OpenSearch-Dashboards/plugins/dashboards-observability

- name: Plugin Bootstrap
run: |
cd OpenSearch-Dashboards/plugins/dashboards-observability
yarn osd bootstrap

derek-ho marked this conversation as resolved.
Show resolved Hide resolved
# 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.

- name: Build Artifact
run: |
cd OpenSearch-Dashboards/plugins/dashboards-observability
yarn build
mv ./build/*.zip ./build/${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}.zip

- name: Upload Artifact
uses: actions/upload-artifact@v1
with:
name: dashboards-observability-windows
path: ./OpenSearch-Dashboards/plugins/dashboards-observability/build

macos-build:

runs-on: macos-latest

steps:
- name: Checkout Plugin
uses: actions/checkout@v1

- name: Checkout OpenSearch Dashboards
uses: actions/checkout@v2
with:
repository: opensearch-project/OpenSearch-Dashboards
ref: ${{ env.OPENSEARCH_VERSION }}
path: OpenSearch-Dashboards

- name: Get node and yarn versions
id: versions_step
run: |
echo "::set-output name=node_version::$(node -p "(require('./OpenSearch-Dashboards/package.json').engines.node).match(/[.0-9]+/)[0]")"
echo "::set-output name=yarn_version::$(node -p "(require('./OpenSearch-Dashboards/package.json').engines.yarn).match(/[.0-9]+/)[0]")"

- name: Setup node
uses: actions/setup-node@v1
with:
node-version: ${{ steps.versions_step.outputs.node_version }}
registry-url: 'https://registry.npmjs.org'

- name: Install correct yarn version for OpenSearch Dashboards
run: |
npm uninstall -g yarn
echo "Installing yarn ${{ steps.versions_step.outputs.yarn_version }}"
npm i -g yarn@${{ steps.versions_step.outputs.yarn_version }}

- name: Move Observability to Plugins Dir
run: mv dashboards-observability OpenSearch-Dashboards/plugins/dashboards-observability

- name: Plugin Bootstrap
run: |
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.

- name: Build Artifact
run: |
cd OpenSearch-Dashboards/plugins/dashboards-observability
yarn build
mv ./build/*.zip ./build/${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}.zip

- name: Upload Artifact
uses: actions/upload-artifact@v1
with:
name: dashboards-observability-macos
path: ./OpenSearch-Dashboards/plugins/dashboards-observability/build


71 changes: 69 additions & 2 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 @@ -3,7 +3,7 @@ name: Test and Build OpenSearch Observability Backend Plugin
on: [pull_request, push]

jobs:
build:
linux-build:
strategy:
matrix:
java:
Expand Down Expand Up @@ -46,5 +46,72 @@ jobs:
- name: Upload Artifacts
uses: actions/upload-artifact@v1
with:
name: opensearch-observability
name: opensearch-observability-ubuntu
path: opensearch-observability-builds

windows-build:
strategy:
matrix:
java:
- 11
- 17

runs-on: windows-latest

steps:
- uses: actions/checkout@v1

- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v1
with:
java-version: ${{ matrix.java }}

derek-ho marked this conversation as resolved.
Show resolved Hide resolved
- name: Build with Gradle
run: |
cd opensearch-observability
./gradlew.bat build -x integTest -x jacocoTestReport

- name: Create Artifact Path
run: |
mkdir -p opensearch-observability-builds
cp -r ./opensearch-observability/build/distributions/*.zip opensearch-observability-builds/

- name: Upload Artifacts
uses: actions/upload-artifact@v1
with:
name: opensearch-observability-windows
path: opensearch-observability-builds

macos-build:
strategy:
matrix:
java:
- 11
- 17

runs-on: macos-latest

steps:
- uses: actions/checkout@v1

- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v1
with:
java-version: ${{ matrix.java }}

- name: Build with Gradle
run: |
cd opensearch-observability
./gradlew build -x integTest -x jacocoTestReport

- name: Create Artifact Path
run: |
mkdir -p opensearch-observability-builds
cp -r ./opensearch-observability/build/distributions/*.zip opensearch-observability-builds/

- name: Upload Artifacts
uses: actions/upload-artifact@v1
with:
name: opensearch-observability-macos
path: opensearch-observability-builds