Skip to content

Commit eb33bd2

Browse files
committed
rebase
Signed-off-by: xinyual <xinyual@amazon.com>
2 parents 642b022 + 1d30671 commit eb33bd2

File tree

31 files changed

+1482
-666
lines changed

31 files changed

+1482
-666
lines changed

.github/workflows/CI-workflow.yml

+12-12
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ jobs:
2727
strategy:
2828
matrix:
2929
java: [21]
30-
env:
31-
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
3230

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

4644
steps:
45+
- name: Run start commands
46+
run: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-command }}
4747
- name: Setup Java ${{ matrix.java }}
4848
uses: actions/setup-java@v1
4949
with:
5050
java-version: ${{ matrix.java }}
5151

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

5757
- name: Checkout MLCommons
58-
uses: actions/checkout@v3
58+
uses: actions/checkout@v4
5959
with:
6060
ref: ${{ github.event.pull_request.head.sha }}
6161

@@ -77,7 +77,7 @@ jobs:
7777
echo "build-test-linux=$plugin" >> $GITHUB_OUTPUT
7878
7979
- name: Upload Coverage Report
80-
uses: codecov/codecov-action@v1
80+
uses: codecov/codecov-action@v4
8181
with:
8282
flags: ml-commons
8383
token: ${{ secrets.CODECOV_TOKEN }}
@@ -101,7 +101,7 @@ jobs:
101101
runs-on: ubuntu-latest
102102

103103
steps:
104-
- uses: aws-actions/configure-aws-credentials@v2
104+
- uses: aws-actions/configure-aws-credentials@v4
105105
with:
106106
role-to-assume: ${{ secrets.ML_ROLE }}
107107
aws-region: us-west-2
@@ -112,11 +112,11 @@ jobs:
112112
java-version: ${{ matrix.java }}
113113

114114
- name: Checkout MLCommons
115-
uses: actions/checkout@v3
115+
uses: actions/checkout@v4
116116
with:
117117
ref: ${{ github.event.pull_request.head.sha }}
118118

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

@@ -181,7 +181,7 @@ jobs:
181181
fi
182182
183183
- name: Upload Coverage Report
184-
uses: codecov/codecov-action@v3
184+
uses: codecov/codecov-action@v4
185185
with:
186186
flags: ml-commons
187187
token: ${{ secrets.CODECOV_TOKEN }}
@@ -202,14 +202,14 @@ jobs:
202202
with:
203203
java-version: ${{ matrix.java }}
204204

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

210210
# ml-commons
211211
- name: Checkout MLCommons
212-
uses: actions/checkout@v3
212+
uses: actions/checkout@v4
213213
with:
214214
ref: ${{ github.event.pull_request.head.sha }}
215215

common/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ dependencies {
2626
compileOnly group: 'org.apache.commons', name: 'commons-text', version: '1.10.0'
2727
compileOnly group: 'com.google.code.gson', name: 'gson', version: '2.10.1'
2828
compileOnly group: 'org.json', name: 'json', version: '20231013'
29+
testImplementation group: 'org.json', name: 'json', version: '20231013'
2930
implementation('com.google.guava:guava:32.1.2-jre') {
3031
exclude group: 'com.google.guava', module: 'failureaccess'
3132
exclude group: 'com.google.code.findbugs', module: 'jsr305'

0 commit comments

Comments
 (0)