From: David Rautureau <david.rautureau@sonarsource.com>
Date: Thu, 5 Apr 2018 15:26:28 +0000 (+0200)
Subject: Fix Artifactory properties
X-Git-Tag: 7.5~1379
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f239ffffd3818fec2aa2d74b12875355324df73e;p=sonarqube.git

Fix Artifactory properties
---

diff --git a/build.gradle b/build.gradle
index 3c6bbe71576..d07385c5338 100644
--- a/build.gradle
+++ b/build.gradle
@@ -389,10 +389,10 @@ artifactory {
       properties = [
         'build.name': 'sonar-enterprise',
         'build.number': (System.getenv('BUILD_ID') ?: System.getenv('BUILD_NUMBER')),
-        'pr.branch.target': System.getenv('PULL_REQUEST_BRANCH_TARGET'),
-        'pr.number': System.getenv('PULL_REQUEST_NUMBER'),
-        'vcs.branch': System.getenv('GIT_BRANCH'),
-        'vcs.revision': System.getenv('GIT_COMMIT'),
+        'pr.branch.target': System.getenv('GITHUB_TARGET_BRANCH'),
+        'pr.number': System.getenv('PULL_REQUEST'),
+        'vcs.branch': System.getenv('GITHUB_BASE_BRANCH') ?: System.getenv('GITHUB_BRANCH'),
+        'vcs.revision': System.getenv('GIT_SHA1'),
         'version': version
       ]
       publications('mavenJava')