Skip to content

Commit

Permalink
rebase
Browse files Browse the repository at this point in the history
Signed-off-by: xinyual <[email protected]>
  • Loading branch information
xinyual committed Dec 4, 2024
2 parents 642b022 + 1d30671 commit eb33bd2
Show file tree
Hide file tree
Showing 31 changed files with 1,482 additions and 666 deletions.
24 changes: 12 additions & 12 deletions .github/workflows/CI-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ jobs:
strategy:
matrix:
java: [21]
env:
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true

name: Build and Test MLCommons Plugin on linux
if: github.repository == 'opensearch-project/ml-commons'
Expand All @@ -41,21 +39,23 @@ jobs:
# this image tag is subject to change as more dependencies and updates will arrive over time
image: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-version-linux }}
# need to switch to root so that github actions can install runner binary on container without permission issues.
options: --user root
options: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-options }}

steps:
- name: Run start commands
run: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-command }}
- name: Setup Java ${{ matrix.java }}
uses: actions/setup-java@v1
with:
java-version: ${{ matrix.java }}

- uses: aws-actions/configure-aws-credentials@v2
- uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: ${{ secrets.ML_ROLE }}
aws-region: us-west-2

- name: Checkout MLCommons
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}

Expand All @@ -77,7 +77,7 @@ jobs:
echo "build-test-linux=$plugin" >> $GITHUB_OUTPUT
- name: Upload Coverage Report
uses: codecov/codecov-action@v1
uses: codecov/codecov-action@v4
with:
flags: ml-commons
token: ${{ secrets.CODECOV_TOKEN }}
Expand All @@ -101,7 +101,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: aws-actions/configure-aws-credentials@v2
- uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: ${{ secrets.ML_ROLE }}
aws-region: us-west-2
Expand All @@ -112,11 +112,11 @@ jobs:
java-version: ${{ matrix.java }}

- name: Checkout MLCommons
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}

- uses: actions/download-artifact@v4.1.7
- uses: actions/download-artifact@v4
with:
name: ml-plugin-linux-${{ matrix.java }}

Expand Down Expand Up @@ -181,7 +181,7 @@ jobs:
fi
- name: Upload Coverage Report
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
flags: ml-commons
token: ${{ secrets.CODECOV_TOKEN }}
Expand All @@ -202,14 +202,14 @@ jobs:
with:
java-version: ${{ matrix.java }}

- uses: aws-actions/configure-aws-credentials@v2
- uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: ${{ secrets.ML_ROLE }}
aws-region: us-west-2

# ml-commons
- name: Checkout MLCommons
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}

Expand Down
1 change: 1 addition & 0 deletions common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ dependencies {
compileOnly group: 'org.apache.commons', name: 'commons-text', version: '1.10.0'
compileOnly group: 'com.google.code.gson', name: 'gson', version: '2.10.1'
compileOnly group: 'org.json', name: 'json', version: '20231013'
testImplementation group: 'org.json', name: 'json', version: '20231013'
implementation('com.google.guava:guava:32.1.2-jre') {
exclude group: 'com.google.guava', module: 'failureaccess'
exclude group: 'com.google.code.findbugs', module: 'jsr305'
Expand Down
Loading

0 comments on commit eb33bd2

Please sign in to comment.