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

Separate Spotless Check to JDK 17 and Exclude from other Build Process #3354

Merged
merged 4 commits into from
Jan 14, 2025
Merged

Separate Spotless Check to JDK 17 and Exclude from other Build Process #3354

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dfb19f8
Modify to run spotless separately with JDK 17 to avoid spotlessJava e…
rithin-pullela-aws Jan 9, 2025
922170b
Add spotless check in build-ml-linux step
rithin-pullela-aws Jan 9, 2025
db9a3f7
Use Java 21 for spotless and do not force to run on ubuntu
rithin-pullela-aws Jan 9, 2025
4d772ed
Add spotless as needed for all the steps
rithin-pullela-aws Jan 11, 2025
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
31 changes: 21 additions & 10 deletions .github/workflows/CI-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,19 @@ jobs:
with:
product: opensearch

spotless:
steps:
- uses: actions/checkout@v4
# Spotless requires JDK 17+
- name: Setup Java 21
uses: actions/setup-java@v1
with:
java-version: 21
- name: Spotless Check
run: ./gradlew spotlessCheck

Build-ml-linux:
needs: [Get-Require-Approval, Get-CI-Image-Tag]
needs: [Get-Require-Approval, Get-CI-Image-Tag, spotless]
strategy:
matrix:
java: [11, 17, 21]
Expand Down Expand Up @@ -67,9 +78,9 @@ jobs:
export COHERE_KEY=`aws secretsmanager get-secret-value --secret-id github_cohere_key --query SecretString --output text` &&
echo "::add-mask::$OPENAI_KEY" &&
echo "::add-mask::$COHERE_KEY" &&
echo "build and run tests" && ./gradlew build &&
echo "Publish to Maven Local" && ./gradlew publishToMavenLocal &&
echo "Multi Nodes Integration Testing" && ./gradlew integTest -PnumNodes=3'
echo "build and run tests" && ./gradlew build -x spotlessJava &&
echo "Publish to Maven Local" && ./gradlew publishToMavenLocal -x spotlessJava &&
echo "Multi Nodes Integration Testing" && ./gradlew integTest -PnumNodes=3 -x spotlessJava'
plugin=`basename $(ls plugin/build/distributions/*.zip)`
echo $plugin
mv -v plugin/build/distributions/$plugin ./
Expand All @@ -89,7 +100,7 @@ jobs:


Test-ml-linux-docker:
needs: [Get-Require-Approval, Build-ml-linux]
needs: [Get-Require-Approval, Build-ml-linux, spotless]
strategy:
matrix:
java: [11, 17, 21]
Expand Down Expand Up @@ -168,10 +179,10 @@ jobs:
if [ $security -gt 0 ]
then
echo "Security plugin is available"
./gradlew integTest -Dtests.rest.cluster=localhost:9200 -Dtests.cluster=localhost:9200 -Dtests.clustername="docker-cluster" -Dhttps=true -Duser=admin -Dpassword=${{ steps.genpass.outputs.password }}
./gradlew integTest -Dtests.rest.cluster=localhost:9200 -Dtests.cluster=localhost:9200 -Dtests.clustername="docker-cluster" -Dhttps=true -Duser=admin -Dpassword=${{ steps.genpass.outputs.password }} -x spotlessJava
else
echo "Security plugin is NOT available"
./gradlew integTest -Dtests.rest.cluster=localhost:9200 -Dtests.cluster=localhost:9200 -Dtests.clustername="docker-cluster"
./gradlew integTest -Dtests.rest.cluster=localhost:9200 -Dtests.cluster=localhost:9200 -Dtests.clustername="docker-cluster" -x spotlessJava
fi

- name: Upload Coverage Report
Expand All @@ -186,7 +197,7 @@ jobs:
java: [11, 17, 21]
name: Build and Test MLCommons Plugin on Windows
if: github.repository == 'opensearch-project/ml-commons'
needs: [Get-Require-Approval]
needs: [Get-Require-Approval, spotless]
environment: ${{ needs.Get-Require-Approval.outputs.is-require-approval }}
runs-on: windows-latest

Expand Down Expand Up @@ -214,10 +225,10 @@ jobs:
export COHERE_KEY=$(aws secretsmanager get-secret-value --secret-id github_cohere_key --query SecretString --output text)
echo "::add-mask::$OPENAI_KEY"
echo "::add-mask::$COHERE_KEY"
./gradlew.bat build
./gradlew.bat build -x spotlessJava
- name: Publish to Maven Local
run: |
./gradlew publishToMavenLocal
./gradlew publishToMavenLocal -x spotlessJava
# - name: Multi Nodes Integration Testing
# shell: bash
# run: |
Expand Down
Loading