diff options
| author | David Rautureau <david.rautureau@sonarsource.com> | 2018-03-19 10:42:25 +0100 |
|---|---|---|
| committer | SonarTech <sonartech@sonarsource.com> | 2018-03-22 12:37:47 +0100 |
| commit | 99da49bb3ba36077917d82ba9affd1e6f24f5d8d (patch) | |
| tree | a50ca9c31ed310461cb8cb22208a3d7c844fbf0f | |
| parent | 0a9d9db7f85e7d45b4ffa319d262231f311641f9 (diff) | |
| download | sonarqube-99da49bb3ba36077917d82ba9affd1e6f24f5d8d.tar.gz sonarqube-99da49bb3ba36077917d82ba9affd1e6f24f5d8d.zip | |
Enable deployment of artifacts on release branches
| -rw-r--r-- | build.gradle | 1 | ||||
| -rw-r--r-- | settings.gradle | 2 | ||||
| -rwxr-xr-x | travis.sh | 8 |
3 files changed, 6 insertions, 5 deletions
diff --git a/build.gradle b/build.gradle index 1e4502d2448..88bdc56d3ca 100644 --- a/build.gradle +++ b/build.gradle @@ -300,6 +300,7 @@ artifactory { publishIvy = false } } + clientConfig.info.setBuildName('sonar-enterprise') clientConfig.info.setBuildNumber(System.getenv('BUILD_NUMBER')) // Define the artifacts to be deployed to https://sonarsource.bintray.com on releases clientConfig.info.addEnvironmentProperty('ARTIFACTS_TO_PUBLISH', "${project.group}:sonar-application:zip,com.sonarsource.governance:sonar-governance-plugin:jar,com.sonarsource.developer:sonar-developer-plugin:jar,com.sonarsource.ha:sonar-ha-plugin:jar,com.sonarsource.branch:sonar-branch-plugin:jar") diff --git a/settings.gradle b/settings.gradle index 49f30309a16..4aafd11b675 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,4 @@ -rootProject.name = 'sonar-enterprise' +rootProject.name = 'sonarqube' include 'plugins:sonar-xoo-plugin' diff --git a/travis.sh b/travis.sh index 6674f5f7b28..baa705d9eea 100755 --- a/travis.sh +++ b/travis.sh @@ -78,10 +78,10 @@ BUILD) if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo 'Build and analyze master' - # FIXME analysis and deployment disabled for now + # FIXME analysis disabled for now ./gradlew --no-daemon --console plain \ -DbuildNumber=$BUILD_NUMBER \ - build -PjacocoEnabled=true -Prelease=true \ + build artifactoryPublish -PjacocoEnabled=true -Prelease=true \ -Dsonar.host.url=$SONAR_HOST_URL \ -Dsonar.login=$SONAR_TOKEN \ -Dsonar.projectVersion=$INITIAL_VERSION \ @@ -92,10 +92,10 @@ BUILD) elif [[ "$TRAVIS_BRANCH" == "branch-"* ]] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo 'Build release branch' - # FIXME analysis and deployment disabled for now + # FIXME analysis disabled for now ./gradlew --no-daemon --console plain \ -DbuildNumber=$BUILD_NUMBER \ - build -PjacocoEnabled=true -Prelease=true \ + build artifactoryPublish -PjacocoEnabled=true -Prelease=true \ -Dsonar.host.url=$SONAR_HOST_URL \ -Dsonar.login=$SONAR_TOKEN \ -Dsonar.branch.name=$TRAVIS_BRANCH \ |