From d90af650d88fdd4664a1e97939e845fcc0efab0b Mon Sep 17 00:00:00 2001 From: Rafael Raposo Date: Tue, 6 Aug 2024 10:56:21 +0200 Subject: [PATCH] pack and IT Signed-off-by: Rafael Raposo --- .../project/FlytekitScalaPlugin.scala | 9 ++++++--- flytekit-examples-scala/project/plugins.sbt | 1 + integration-tests/src/test/java/org/flyte/Fixtures.java | 3 +++ 3 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 flytekit-examples-scala/project/plugins.sbt diff --git a/flytekit-examples-scala/project/FlytekitScalaPlugin.scala b/flytekit-examples-scala/project/FlytekitScalaPlugin.scala index 081022df..9684d0d9 100644 --- a/flytekit-examples-scala/project/FlytekitScalaPlugin.scala +++ b/flytekit-examples-scala/project/FlytekitScalaPlugin.scala @@ -17,8 +17,10 @@ package org.flyte.flytekitscala import io.github.classgraph.{ClassGraph, ClassInfo, ClassInfoList, ScanResult} -import sbt.Keys._ -import sbt._ +import sbt.Keys.* +import sbt.* +import xerial.sbt.pack.PackPlugin +import xerial.sbt.pack.PackPlugin.autoImport.{packCopyDependenciesTarget, packDir, packLibJars, packResourceDir, packTargetDir} import scala.collection.JavaConverters.* @@ -36,6 +38,7 @@ object FlytekitScalaPlugin extends AutoPlugin { ) override def trigger: PluginTrigger = noTrigger + override def requires: Plugins = PackPlugin @@ -47,7 +50,7 @@ object FlytekitScalaPlugin extends AutoPlugin { "org.flyte" %% "flytekit-scala" % flyteVersion.value, "org.flyte" % "flytekit-testing" % flyteVersion.value % Test ), - // add flyte generated services after compilation as a jar resource + // add flyte generated services after compilation as a jar resource // note that we first have to remove potentially duplicated META-INF/services // files to address a failure path like: // $ sbt clean pack diff --git a/flytekit-examples-scala/project/plugins.sbt b/flytekit-examples-scala/project/plugins.sbt new file mode 100644 index 00000000..467be7cd --- /dev/null +++ b/flytekit-examples-scala/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "0.20") \ No newline at end of file diff --git a/integration-tests/src/test/java/org/flyte/Fixtures.java b/integration-tests/src/test/java/org/flyte/Fixtures.java index 07aeb824..40f68a86 100644 --- a/integration-tests/src/test/java/org/flyte/Fixtures.java +++ b/integration-tests/src/test/java/org/flyte/Fixtures.java @@ -16,6 +16,8 @@ */ package org.flyte; +import static org.flyte.examples.FlyteEnvironment.STAGING_DOMAIN; + import org.flyte.utils.FlyteSandboxClient; class Fixtures { @@ -24,5 +26,6 @@ class Fixtures { static { CLIENT.registerWorkflows("integration-tests/target/lib"); CLIENT.registerWorkflows("flytekit-examples/target/lib"); + CLIENT.registerWorkflows("flytekit-examples-scala/target/pack/lib", STAGING_DOMAIN); } }