From 3a05d580ae07f7d71c5ce9031d144e20b2440191 Mon Sep 17 00:00:00 2001 From: Michael Barz Date: Fri, 10 Jul 2020 17:19:02 +0200 Subject: [PATCH] fix sonar Signed-off-by: Michael Barz --- .drone.star | 1 - sonar-project.properties | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.drone.star b/.drone.star index e59576e08..f39ff5fef 100644 --- a/.drone.star +++ b/.drone.star @@ -134,7 +134,6 @@ def testing(ctx): 'SONAR_TOKEN': { 'from_secret': 'sonar_token', }, - 'SONAR_PULL_REQUEST_REPO': 'owncloud/ocis-thumbnails' if ctx.build.event == 'pull_request' else None, 'SONAR_PULL_REQUEST_BASE': 'master' if ctx.build.event == 'pull_request' else None, 'SONAR_PULL_REQUEST_BRANCH': ctx.build.source if ctx.build.event == 'pull_request' else None, 'SONAR_PULL_REQUEST_KEY': ctx.build.ref.replace("refs/pull/", "").split("/")[0] if ctx.build.event == 'pull_request' else None, diff --git a/sonar-project.properties b/sonar-project.properties index d878209b1..e9cc5c0de 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -24,9 +24,9 @@ sonar.sources=. # Pull Requests sonar.pullrequest.provider=GitHub sonar.pullrequest.github.repository=owncloud/ocis-thumbnails -sonar.pullrequest.base=${env.DRONE_BRANCH} -sonar.pullrequest.branch=${env.DRONE_SOURCE_BRANCH} -sonar.pullrequest.key=${env.DRONE_PULL_REQUEST} +sonar.pullrequest.base=${env.SONAR_PULL_REQUEST_BASE} +sonar.pullrequest.branch=${env.SONAR_PULL_REQUEST_BRANCH} +sonar.pullrequest.key=${env.SONAR_PULL_REQUEST_KEY} # Properties specific to language plugins: sonar.go.coverage.reportPaths=coverage.out