From 1bfd814c2b4d3e1e0d7734d0c564b395c28612fd Mon Sep 17 00:00:00 2001 From: Austin DeNoble Date: Wed, 14 Feb 2024 14:54:54 -0500 Subject: [PATCH] back out gradle wrapper changes, tweak findIndexByDimensionAndType again, max-parallel again --- .github/workflows/pr.yml | 3 ++- build.gradle | 1 - gradle/wrapper/gradle-wrapper.properties | 2 +- src/integration/java/io/pinecone/helpers/IndexManager.java | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 0533b18d..2e4fa8e9 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -58,6 +58,7 @@ jobs: { java: 8, gradle: 6.8 }, { java: 17, gradle: 7.3.1 } ] + max-parallel: 1 steps: - uses: actions/checkout@v4 @@ -83,5 +84,5 @@ jobs: env: PINECONE_API_KEY: ${{ secrets.PINECONE_API_KEY }} PINECONE_ENVIRONMENT: ${{ secrets.PINECONE_ENVIRONMENT }} - + diff --git a/build.gradle b/build.gradle index aea0cca5..45c0f3bf 100644 --- a/build.gradle +++ b/build.gradle @@ -97,7 +97,6 @@ tasks.named('build') { test { useJUnitPlatform() - testLogging { events = [TestLogEvent.FAILED, TestLogEvent.PASSED, TestLogEvent.SKIPPED, TestLogEvent.STANDARD_OUT] exceptionFormat = TestExceptionFormat.FULL diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e750102e..da9702f9 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/integration/java/io/pinecone/helpers/IndexManager.java b/src/integration/java/io/pinecone/helpers/IndexManager.java index 98d96bf1..08dbbfbc 100644 --- a/src/integration/java/io/pinecone/helpers/IndexManager.java +++ b/src/integration/java/io/pinecone/helpers/IndexManager.java @@ -49,11 +49,11 @@ private static String findIndexWithDimensionAndType(IndexList indexList, int dim while (i < indexModels.size()) { IndexModel indexModel = isIndexReady(indexModels.get(i).getName(), controlPlaneClient); if (indexModel.getDimension() == dimension - && (indexType.equalsIgnoreCase(IndexModelSpec.SERIALIZED_NAME_POD) + && ((indexType.equalsIgnoreCase(IndexModelSpec.SERIALIZED_NAME_POD) && indexModel.getSpec().getPod() != null && indexModel.getSpec().getPod().getReplicas() == 1 && indexModel.getSpec().getPod().getPodType().equalsIgnoreCase("p1.x1")) - || (indexType.equalsIgnoreCase(IndexModelSpec.SERIALIZED_NAME_SERVERLESS))) { + || (indexType.equalsIgnoreCase(IndexModelSpec.SERIALIZED_NAME_SERVERLESS)))) { return indexModel.getName(); } i++;