You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by da...@apache.org on 2023/01/25 13:52:15 UTC

[beam] branch master updated: [ToB][Frontend] Gradle tasks for ToB frontend (#24919)

This is an automated email from the ASF dual-hosted git repository.

damccorm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new 72d2776bf3a [ToB][Frontend] Gradle tasks for ToB frontend (#24919)
72d2776bf3a is described below

commit 72d2776bf3a51f901acd00f9e59ad014817ad85a
Author: Darkhan Nausharipov <31...@users.noreply.github.com>
AuthorDate: Wed Jan 25 19:52:06 2023 +0600

    [ToB][Frontend] Gradle tasks for ToB frontend (#24919)
    
    * WIP: playground_components works in tour-of-beam only with configureondemand set to false (#24563)
    
    * added evaluationDependsOn playground_components (#24563)
    
    * comments (1) (#24563)
    
    * removed goToContextLine after merge (#24563)
    
    Co-authored-by: darkhan.nausharipov <da...@kzn.akvelon.com>
---
 .../tour-of-beam/frontend/build.gradle.kts         | 106 ++-------------------
 playground/frontend/build.gradle                   |   6 +-
 settings.gradle.kts                                |   3 +
 3 files changed, 14 insertions(+), 101 deletions(-)

diff --git a/playground/frontend/build.gradle b/learning/tour-of-beam/frontend/build.gradle.kts
similarity index 51%
copy from playground/frontend/build.gradle
copy to learning/tour-of-beam/frontend/build.gradle.kts
index 8e15f2f6111..31bf46e59ff 100644
--- a/playground/frontend/build.gradle
+++ b/learning/tour-of-beam/frontend/build.gradle.kts
@@ -16,25 +16,10 @@
  * limitations under the License.
  */
 
-
-apply(plugin: "org.apache.beam.module")
-apply(plugin: "base")
-applyDockerNature()
-
-def playgroundJobServerProject = "${project.path.replace("-container", "")}"
-
-description = project(playgroundJobServerProject).description + " :: Container"
-
-configurations {
-  dockerDependency
-}
-
-dependencies {
-  dockerDependency(project(path: playgroundJobServerProject, configuration: "shadow"))
-}
+evaluationDependsOn(":playground:frontend:playground_components")
 
 tasks.register("generate") {
-  dependsOn("playground_components:generate")
+  dependsOn(":playground:frontend:playground_components:generate")
 
   dependsOn("generateCode")
 
@@ -42,17 +27,8 @@ tasks.register("generate") {
   description = "Generates all generated files."
 }
 
-tasks.register("printPath") {
-  doLast {
-    exec {
-      executable("printenv")
-      args("PATH")
-    }
-  }
-}
-
 tasks.register("analyze") {
-  dependsOn("playground_components:generateCode")
+  dependsOn(":playground:frontend:playground_components:generateCode")
   dependsOn("generateCode")
 
   group = "verification"
@@ -60,7 +36,6 @@ tasks.register("analyze") {
 
   doLast {
     exec {
-      // Exact paths instead of '.' so it does not go into playground_components
       executable("dart")
       args("analyze", "lib", "test")
     }
@@ -69,7 +44,7 @@ tasks.register("analyze") {
 
 tasks.register("pubGet") {
   group = "build"
-  description = "Get packages for the playground frontend project"
+  description = "Get packages for the frontend project"
   doLast {
     exec {
       executable("flutter")
@@ -83,7 +58,6 @@ tasks.register("format") {
   description = "Idiomatically format Dart source code"
   doLast {
     exec {
-      // Exact paths instead of '.' so it does not go into playground_components
       executable("dart")
       args("format", "lib", "test")
     }
@@ -103,7 +77,7 @@ tasks.register("run") {
 }
 
 tasks.register("test") {
-  dependsOn("playground_components:generateCode")
+  dependsOn(":playground:frontend:playground_components:generateCode")
   dependsOn("generateCode")
 
   group = "verification"
@@ -118,14 +92,14 @@ tasks.register("test") {
 }
 
 tasks.register("precommit") {
-  dependsOn("playground_components:precommit")
+  dependsOn(":playground:frontend:playground_components:precommit")
 
   dependsOn("analyze")
   dependsOn("test")
 }
 
 tasks.register("generateCode") {
-  dependsOn("playground_components:generateCode")
+  dependsOn(":playground:frontend:playground_components:generateCode")
 
   dependsOn("cleanFlutter")
   dependsOn("pubGet")
@@ -154,7 +128,7 @@ tasks.register("cleanFlutter") {
 }
 
 tasks.register("cleanGenerated") {
-  dependsOn("playground_components:cleanGenerated")
+  dependsOn(":playground:frontend:playground_components:cleanGenerated")
 
   group = "build"
   description = "Remove build artifacts"
@@ -168,77 +142,15 @@ tasks.register("cleanGenerated") {
   }
 }
 
-ext.deleteFilesByRegExp = { re ->
+val deleteFilesByRegExp: (String) -> Unit = { re ->
   // Prints file names.
   exec {
     executable("find")
     args("assets", "lib", "test", "-regex", re)
   }
-
   // Actually deletes them.
   exec {
     executable("find")
     args("assets", "lib", "test", "-regex", re, "-delete")
   }
 }
-
-tasks.register("integrationTest") {
-  dependsOn("integrationTest_standalone_change_example_sdk_run")
-  dependsOn("integrationTest_standalone_miscellaneous_ui")
-}
-
-tasks.register("integrationTest_standalone_change_example_sdk_run") {
-  doLast {
-    runIntegrationTest("standalone_change_example_sdk_run", "/")
-  }
-}
-
-tasks.register("integrationTest_standalone_miscellaneous_ui") {
-  doLast {
-    runIntegrationTest("standalone_miscellaneous_ui", "/")
-  }
-}
-
-void runIntegrationTest(String path, String url) {
-  exec {
-    executable("flutter")
-    args(
-      "drive",
-      "--driver=test_driver/integration_test.dart",
-      "--target=integration_test/${path}_test.dart",
-      "--web-launch-url='$url'",
-      "--device-id=chrome",
-    )
-  }
-}
-
-task copyDockerfileDependencies(type: Copy) {
-   group = "build"
-   description = "Copy files that required to build docker container"
-   copy {
-      from(".")
-      into("build/")
-      exclude("build")
-      exclude("Dockerfile")
-   }
-   copy {
-      from("../playground")
-      into("build/playground")
-   }
-}
-
-docker {
-  group = "build"
-  description = "Build container for playground frontend application"
-  name = containerImageName(
-    name: project.docker_image_default_repo_prefix + "playground-frontend",
-    root: project.rootProject.hasProperty(["docker-repository-root"])
-            ? project.rootProject["docker-repository-root"]
-            : project.docker_image_default_repo_root
-  )
-  files("./build/")
-  tags(containerImageTags())
-}
-
-// Ensure that we build the required resources and copy and file dependencies from related projects
-dockerPrepare.dependsOn(copyDockerfileDependencies)
diff --git a/playground/frontend/build.gradle b/playground/frontend/build.gradle
index 8e15f2f6111..d20f6b02576 100644
--- a/playground/frontend/build.gradle
+++ b/playground/frontend/build.gradle
@@ -60,7 +60,6 @@ tasks.register("analyze") {
 
   doLast {
     exec {
-      // Exact paths instead of '.' so it does not go into playground_components
       executable("dart")
       args("analyze", "lib", "test")
     }
@@ -69,7 +68,7 @@ tasks.register("analyze") {
 
 tasks.register("pubGet") {
   group = "build"
-  description = "Get packages for the playground frontend project"
+  description = "Get packages for the frontend project"
   doLast {
     exec {
       executable("flutter")
@@ -83,7 +82,6 @@ tasks.register("format") {
   description = "Idiomatically format Dart source code"
   doLast {
     exec {
-      // Exact paths instead of '.' so it does not go into playground_components
       executable("dart")
       args("format", "lib", "test")
     }
@@ -229,7 +227,7 @@ task copyDockerfileDependencies(type: Copy) {
 
 docker {
   group = "build"
-  description = "Build container for playground frontend application"
+  description = "Build container for frontend application"
   name = containerImageName(
     name: project.docker_image_default_repo_prefix + "playground-frontend",
     root: project.rootProject.hasProperty(["docker-repository-root"])
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 5dd3e8af800..454ba5cb64b 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -74,6 +74,9 @@ include(":playground:backend:containers:python")
 include(":playground:backend:containers:router")
 include(":playground:backend:containers:scio")
 include(":playground:terraform")
+
+include(":learning:tour-of-beam:frontend")
+
 include(":runners:core-construction-java")
 include(":runners:core-java")
 include(":runners:direct-java")