Skip to content

Commit

Permalink
Merge pull request #2521 from mbeddr/bugfix/all-scripts-dependency
Browse files Browse the repository at this point in the history
build_mbeddr: add dependency on copy_allScripts
  • Loading branch information
sergej-koscejev authored Sep 17, 2024
2 parents 20eb099 + 1b9d0a0 commit bcad760
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions build/com.mbeddr/languages/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -50,18 +50,18 @@ ant.taskdef(name: 'junit', classname: 'org.apache.tools.ant.taskdefs.optional.ju
ant.taskdef(name: 'junitreport', classname: 'org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator',
classpath: configurations.junitAnt.asPath)

def mbeddrDependencies
def mbeddrPlatformDependency

def usePrebuiltPlatform = ciBuild && !project.hasProperty('forceBuildPlatform')

//on teamcity we don't build the platform we take it from the nexus. Locally we want to build it
if (usePrebuiltPlatform) {
mbeddrDependencies = [resolve_mbeddr_platform]
mbeddrPlatformDependency = resolve_mbeddr_platform
} else {
mbeddrDependencies = [':com.mbeddr:platform:build_platform']
mbeddrPlatformDependency = ':com.mbeddr:platform:build_platform'
}

task build_mbeddr(type: BuildLanguages, dependsOn: mbeddrDependencies) {
task build_mbeddr(type: BuildLanguages, dependsOn: [':com.mbeddr:platform:copy_allScripts', mbeddrPlatformDependency]) {
script script_build_mbeddr
outputs.dir("$artifactsDir/mbeddr")
}
Expand Down

0 comments on commit bcad760

Please sign in to comment.