build fixes

conductor-oss · Dec 19, 2023 · a08d1eb · a08d1eb
1 parent 5ef4cfd
commit a08d1eb
Show file tree

Hide file tree

Showing 6 changed files with 304 additions and 57 deletions.
diff --git a/es6-persistence/build.gradle b/es6-persistence/build.gradle
@@ -11,6 +11,8 @@
  *  specific language governing permissions and limitations under the License.
  */
 
+
+
 dependencies {
     implementation project(':conductor-common')
     implementation project(':conductor-core')
@@ -32,3 +34,9 @@ dependencies {
     testImplementation "org.testcontainers:elasticsearch:${revTestContainer}"
     testImplementation project(':conductor-common').sourceSets.test.output
 }
+
+switch (org.gradle.internal.os.OperatingSystem.current()) {
+    case org.gradle.internal.os.OperatingSystem.MAC_OS:
+        tasks.forEach(task -> task.onlyIf { project.hasProperty('ES6Test') })
+        break;
+}
diff --git a/mysql-persistence/build.gradle b/mysql-persistence/build.gradle
@@ -20,16 +20,16 @@ dependencies {
 
     testImplementation "org.apache.groovy:groovy-all:${revGroovy}"
 
-    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:6.8.23"
-    testImplementation "org.elasticsearch.client:elasticsearch-rest-high-level-client:6.8.23"
-    testImplementation "org.testcontainers:elasticsearch:${revTestContainer}"
+//    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:6.8.23"
+//    testImplementation "org.elasticsearch.client:elasticsearch-rest-high-level-client:6.8.23"
 
+    testImplementation "org.testcontainers:elasticsearch:${revTestContainer}"
     testImplementation "org.testcontainers:mysql:${revTestContainer}"
 
     testImplementation project(':conductor-server')
     testImplementation project(':conductor-client')
     testImplementation project(':conductor-grpc-client')
-    testImplementation project(':conductor-es6-persistence')
+    testImplementation project(':conductor-es7-persistence')
 
     testImplementation project(':conductor-test-util').sourceSets.test.output
     testImplementation project(':conductor-common-persistence').sourceSets.test.output