Skip to content

Commit

Permalink
Team city config release (#340)
Browse files Browse the repository at this point in the history
* adjusting windows 64 release build

* Correct referrence to download Ribasim 2024.11 release

* Changed curl download command

* release build restored
  • Loading branch information
rleander authored Oct 18, 2024
1 parent 6391b75 commit 135282e
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 43 deletions.
47 changes: 9 additions & 38 deletions .teamcity/IMODCollector/buildTypes/IMODCollector_X64Release.kt
Original file line number Diff line number Diff line change
Expand Up @@ -63,58 +63,29 @@ object IMODCollector_X64Release : BuildType({
scriptContent = """call dist\imodc --version"""
}
script {
name = "Download Release MODFLOW6"
name = "Download Release MODFLOW 6.5.0"
scriptContent = """
mkdir modflow6
curl -O https://water.usgs.gov/water-resources/software/MODFLOW-6/mf6.5.0_win64.zip
unzip -j "mf6.5.0_win64.zip" -d modflow6 mf6.5.0_win64/bin/libmf6.dll
""".trimIndent()
}
}

triggers {
finishBuildTrigger {
buildType = "MSWMOD_MetaSWAP_MetaSWAPBuildWin64trunk"
successfulOnly = true
}
finishBuildTrigger {
buildType = "iMOD6_Modflow6buildWin64"
successfulOnly = true
}
}

features {
commitStatusPublisher {
vcsRootExtId = "${ImodCoupler.id}"
publisher = github {
githubUrl = "https://api.github.com"
authType = personalToken {
token = "credentialsJSON:6b37af71-1f2f-4611-8856-db07965445c0"
}
}
}
pullRequests {
vcsRootExtId = "${ImodCoupler.id}"
provider = github {
authType = token {
token = "credentialsJSON:71420214-373c-4ccd-ba32-2ea886843f62"
}
filterAuthorRole = PullRequests.GitHubRoleFilter.MEMBER
}
script {
name = "Download Release Ribasim v2024.11.0"
scriptContent = """
mkdir modflow6
curl -L -o ribasim_windows.zip https://github.com/Deltares/Ribasim/releases/download/v2024.11.0/ribasim_windows.zip
unzip "ribasim_windows.zip"
""".trimIndent()
}
}

dependencies {
artifacts(AbsoluteId("MSWMOD_MetaSWAP_MetaSWAPBuildWin64trunk")) {
cleanDestination = true
buildRule = tag("release")
buildRule = tag("release_2410")
artifactRules = "MetaSWAP.zip!/x64/Release => metaswap"
}
artifacts(AbsoluteId("Ribasim_Windows_BuildRibasim")) {
cleanDestination = true
buildRule = lastSuccessful()
artifactRules = "ribasim_windows.zip!** => ribasim"
}
}

requirements {
Expand Down
1 change: 1 addition & 0 deletions .teamcity/_Self/Project.kt
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ object Project : Project({
vcsRoot(MetaSwapLookupTable)
vcsRoot(ImodCoupler)

buildType(TestbenchCouplerWin64Release)
buildType(TestbenchCouplerWin64_2)

subProject(Primod.Project)
Expand Down
5 changes: 0 additions & 5 deletions .teamcity/_Self/buildTypes/TestbenchCouplerWin64Release.kt
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,6 @@ object TestbenchCouplerWin64Release : BuildType({
imod_collector.zip!** => imod_collector_devel
""".trimIndent()
}
// artifacts {
// buildRule = tag("regression")
// cleanDestination = true
// artifactRules = "imod_coupler_windows.zip!** => imod_collector_regression"
// }
}
artifacts(AbsoluteId("iMOD6_Coupler_IMODCollector_X64development")){
buildRule = tag("regression")
Expand Down

0 comments on commit 135282e

Please sign in to comment.