From 49e5302b343cd7d71dd2361ba5d8d97a460901b4 Mon Sep 17 00:00:00 2001 From: Fedor Isakov Date: Mon, 8 Feb 2021 08:55:22 +0100 Subject: [PATCH] Move artefacts for update site to TeamCity --- build.gradle | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 44702638..42c45fe1 100644 --- a/build.gradle +++ b/build.gradle @@ -97,27 +97,27 @@ task setup(dependsOn: allInitDependencies) { } } -def tagMatcher() { - System.env.TRAVIS_TAG =~ /v([0-9.]+)-.*\.([0-9]+)/ +def buildNumber() { + System.env.BUILD_NUMBER =~ /MPS-([0-9]+)\.([0-9]+).([0-9]+)-([0-9]+)/ } task generateUpdatePluginsXml { onlyIf { - tagMatcher().find() + buildNumber().find() } doLast { def updatesDir = project.projectDir.absolutePath + "/build/artifacts/coderules/updates" mkdir(updatesDir) - def baseUrl = "https://github.com/JetBrains/mps-coderules/releases/download" + def baseUrl = "https://teamcity.jetbrains.com/guestAuth/repository/download/MPS_20211_Distribution_MpsCodeRules" def zip = "/jebtrains.mps.coderules-0.9-SNAPSHOT.zip" file(updatesDir + "/updatePlugins.xml").withWriter { w -> new MarkupBuilder(new IndentPrinter(w, " ", true)). plugins { plugin( id: "jetbrains.mps.coderules" , - url: baseUrl + "/$System.env.TRAVIS_TAG" + zip , - version: "${tagMatcher()[0][1]}-b${tagMatcher()[0][2]}" ) + url: baseUrl + "/$System.env.BUILD_NUMBER" + zip , + version: "${buildNumber()[0][1]}.${buildNumber()[0][2]}-b${buildNumber()[0][4]}" ) { } } } @@ -131,7 +131,7 @@ ant.taskdef(name: 'junit', ant.importBuild('build.xml') { antTarget -> 'coderules-'+antTarget } -ant.properties.'ci.build.num' = "${tagMatcher().find() ? tagMatcher()[0][2] : '9999'}".toString() +ant.properties.'ci.build.num' = "${buildNumber().find() ? buildNumber()[0][4] : '9999'}".toString() // ensure 'setup' runs before 'fetchDependencies' and 'declare-mps-tasks' 'coderules-fetchDependencies' {