Merge pull request #54155 from madmiraal/fix-54091

Fix Gradle builds not excluding excluded tasks
This commit is contained in:
Rémi Verschelde 2021-10-23 16:21:50 +02:00 committed by GitHub
commit aec383a83e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -158,9 +158,9 @@ def templateBuildTasks() {
/**
* Master task used to coordinate the tasks defined above to generate the set of Godot templates.
*/
task generateGodotTemplates(type: GradleBuild) {
startParameter.excludedTaskNames = templateExcludedBuildTask()
tasks = templateBuildTasks()
task generateGodotTemplates {
gradle.startParameter.excludedTaskNames += templateExcludedBuildTask()
dependsOn = templateBuildTasks()
finalizedBy 'zipCustomBuild'
}
@ -168,12 +168,12 @@ task generateGodotTemplates(type: GradleBuild) {
/**
* Generates the same output as generateGodotTemplates but with dev symbols
*/
task generateDevTemplate (type: GradleBuild) {
task generateDevTemplate {
// add parameter to set symbols to true
startParameter.projectProperties += [doNotStrip: true]
gradle.startParameter.projectProperties += [doNotStrip: true]
startParameter.excludedTaskNames = templateExcludedBuildTask()
tasks = templateBuildTasks()
gradle.startParameter.excludedTaskNames += templateExcludedBuildTask()
dependsOn = templateBuildTasks()
finalizedBy 'zipCustomBuild'
}