From 0c1ba16d8db65ed1a26c7dcc2723ca5228b8f313 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 22 Mar 2022 16:07:21 -0700 Subject: [PATCH] chore(build): run yarn modules before yarn build (#9826) (#9827) Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> (cherry picked from commit 45cf778af2e6cb9ba9136689f52d31ce6f68b7c0) Co-authored-by: Matt <6519811+mattgogerly@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- build.gradle | 12 ++++++++++-- version.json | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 7baa429b62f..c31901f0f21 100644 --- a/build.gradle +++ b/build.gradle @@ -30,8 +30,14 @@ node { download = true } +task modules(type: YarnTask) { + dependsOn "yarn" + yarnCommand = ["modules"] +} + task webpack(type: YarnTask) { dependsOn "yarn" + dependsOn "modules" dependsOn "test" yarnCommand = ["build"] @@ -52,6 +58,7 @@ task copyFavicon(type: Copy) { task karma(type: YarnTask) { dependsOn "yarn" + dependsOn "modules" yarnCommand = ["test"] args = ["--single-run", "--reporters", "dots"] @@ -63,6 +70,7 @@ task karma(type: YarnTask) { task functionalTests(type: YarnTask) { dependsOn "yarn" + dependsOn "modules" yarnCommand = ["functional"] } @@ -76,8 +84,8 @@ task generateVersionFile { ] def buildJson = JsonOutput.prettyPrint(JsonOutput.toJson(buildInfo)) mkdir "build/webpack" - new File(Paths.get("build", "webpack", "version.json").toString()).write(buildJson) - new File("version.json").write(buildJson) + file(Paths.get("build", "webpack", "version.json")).write(buildJson) + file("version.json").write(buildJson) } } diff --git a/version.json b/version.json index d9afec03341..f398680002a 100644 --- a/version.json +++ b/version.json @@ -1,4 +1,4 @@ { "version": "n/a", - "created": 1461949989729 + "created": 1647951273397 } \ No newline at end of file