Fix task dependency (#3420)

## Motivation and Context
Release build was broken because `smithy-build.json` was not being
generated prior to smithyBuild actually running.

## Description
Fix task names

## Testing
Manual patch of release tag with this fix.


----

_By submitting this pull request, I confirm that you can use, modify,
copy, and redistribute this contribution, under the terms of your
choice._
This commit is contained in:
Russell Cohen 2024-02-16 15:42:59 -05:00 committed by GitHub
parent 19648ace5f
commit 8db8f4b0c1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 6 additions and 6 deletions

View File

@ -74,7 +74,7 @@ project.registerGenerateSmithyBuildTask(rootProject, pluginName, allCodegenTests
project.registerGenerateCargoWorkspaceTask(rootProject, pluginName, allCodegenTests, workingDirUnderBuildDir)
project.registerGenerateCargoConfigTomlTask(layout.buildDirectory.dir(workingDirUnderBuildDir).get().asFile)
tasks["jar"].dependsOn("generateSmithyBuild")
tasks["smithyBuild"].dependsOn("generateSmithyBuild")
tasks["assemble"].finalizedBy("generateCargoWorkspace")
project.registerModifyMtimeTask()

View File

@ -407,7 +407,7 @@ tasks.register<ExecRustBuildTool>("generateVersionManifest") {
}
}
tasks["jar"].apply {
tasks["smithyBuild"].apply {
inputs.file(layout.buildDirectory.file("smithy-build.json"))
inputs.dir(projectDir.resolve("aws-models"))
dependsOn("generateSmithyBuild")

View File

@ -118,7 +118,7 @@ project.registerGenerateCargoConfigTomlTask(layout.buildDirectory.dir(workingDir
tasks["generateSmithyBuild"].inputs.property("smithy.runtime.mode", getSmithyRuntimeMode())
tasks["jar"].dependsOn("generateSmithyBuild")
tasks["smithyBuild"].dependsOn("generateSmithyBuild")
tasks["assemble"].finalizedBy("generateCargoWorkspace")
project.registerModifyMtimeTask()

View File

@ -95,7 +95,7 @@ project.registerGenerateSmithyBuildTask(rootProject, pluginName, allCodegenTests
project.registerGenerateCargoWorkspaceTask(rootProject, pluginName, allCodegenTests, workingDirUnderBuildDir)
project.registerGenerateCargoConfigTomlTask(layout.buildDirectory.dir(workingDirUnderBuildDir).get().asFile)
tasks["jar"].dependsOn("generateSmithyBuild")
tasks["smithyBuild"].dependsOn("generateSmithyBuild")
tasks["assemble"].finalizedBy("generateCargoWorkspace", "generateCargoConfigToml")
project.registerModifyMtimeTask()

View File

@ -116,7 +116,7 @@ tasks.register("stubs") {
}
}
tasks["jar"].dependsOn("generateSmithyBuild")
tasks["smithyBuild"].dependsOn("generateSmithyBuild")
tasks["assemble"].finalizedBy("generateCargoWorkspace")
project.registerModifyMtimeTask()

View File

@ -45,7 +45,7 @@ project.registerGenerateSmithyBuildTask(rootProject, pluginName, allCodegenTests
project.registerGenerateCargoWorkspaceTask(rootProject, pluginName, allCodegenTests, workingDirUnderBuildDir)
project.registerGenerateCargoConfigTomlTask(buildDir.resolve(workingDirUnderBuildDir))
tasks["jar"].dependsOn("generateSmithyBuild")
tasks["smithyBuild"].dependsOn("generateSmithyBuild")
tasks["assemble"].finalizedBy("generateCargoWorkspace")
project.registerModifyMtimeTask()