Fix order of node_build and node_publish during publish (#51)

Description =========== A patch to fix a second small error. The build task is now executed but run after the `node_publish` task which means the package is still empty. This patch simply forces the order. Changes ======= * ![FIX] order of `node_build` and `node_publish`
wooga · Apr 1, 2022 · 768218c · 768218c
1 parent 027183f
commit 768218c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/integrationTest/groovy/wooga/gradle/node/NodeReleasePluginPublishSpec.groovy b/src/integrationTest/groovy/wooga/gradle/node/NodeReleasePluginPublishSpec.groovy
@@ -177,6 +177,7 @@ class NodeReleasePluginPublishSpec extends GithubIntegrationSpec {
         then:
         print(result.standardOutput)
         result.success
+        result.standardOutput.indexOf("Task :node_run_build") < result.standardOutput.indexOf("Task :node_publish")
         result.wasExecuted("node_run_build")
         result.wasExecuted("npm_publish")
         hasPackageOnArtifactory(artifactoryRepoName, packageNameForPackageJson())
@@ -212,6 +213,7 @@ class NodeReleasePluginPublishSpec extends GithubIntegrationSpec {
 
         then:
         result.success
+        result.standardOutput.indexOf("Task :node_run_build") < result.standardOutput.indexOf("Task :node_publish")
         result.wasExecuted("node_run_build")
         result.wasExecuted("node_publish")
         result.wasExecuted("npm_publish")

diff --git a/src/main/groovy/wooga/gradle/node/NodeReleasePlugin.groovy b/src/main/groovy/wooga/gradle/node/NodeReleasePlugin.groovy
@@ -169,8 +169,8 @@ class NodeReleasePlugin implements Plugin<Project> {
         nodeBuildTask.dependsOn engineScopedBuildTask
         assembleTask.dependsOn nodeBuildTask
         // Set up publish lifecycle dependencies
-        nodePublishTask.dependsOn engineScopedPublishTask
-        publishTask.dependsOn nodeBuildTask, nodePublishTask
+        nodePublishTask.dependsOn nodeBuildTask, engineScopedPublishTask
+        publishTask.dependsOn nodePublishTask
         githubPublishTask.mustRunAfter nodePublishTask
 
         // TODO: Add custom tasks previously provided by the nebula release plugin