Merge pull request #8202 from vector-im/feature/bma/fixCi

Fix CI
element-hq · Mar 3, 2023 · 97b4730 · 97b4730
2 parents 4f64b20 + ceda85f
commit 97b4730
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -111,7 +111,7 @@ jobs:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
           ORG_GRADLE_PROJECT_SONAR_LOGIN: ${{ secrets.SONAR_TOKEN }}
         if: ${{ always() && env.GITHUB_TOKEN != '' && env.SONAR_TOKEN != '' && env.ORG_GRADLE_PROJECT_SONAR_LOGIN != '' }}
-        run: ./gradlew sonarqube $CI_GRADLE_ARG_PROPERTIES
+        run: ./gradlew sonar $CI_GRADLE_ARG_PROPERTIES
 
       - name: Format unit test results
         if: always()

diff --git a/build.gradle b/build.gradle
@@ -203,10 +203,10 @@ if (launchTask.contains("coverage".toLowerCase())) {
 apply plugin: 'org.sonarqube'
 
 // To run a sonar analysis:
-// Run './gradlew sonarqube -Dsonar.login=<REPLACE_WITH_SONAR_KEY>'
+// Run './gradlew sonar -Dsonar.login=<REPLACE_WITH_SONAR_KEY>'
 // The SONAR_KEY is stored in passbolt as Token Sonar Cloud Bma
 
-sonarqube {
+sonar {
     properties {
         property "sonar.projectName", "element-android"
         property "sonar.projectKey", "vector-im_element-android"
@@ -225,7 +225,7 @@ sonarqube {
 }
 
 project(":vector") {
-    sonarqube {
+    sonar {
         properties {
             property "sonar.sources", project(":vector").android.sourceSets.main.java.srcDirs
             // exclude source code from analyses separated by a colon (:)
@@ -236,13 +236,13 @@ project(":vector") {
 }
 
 project(":library:external:diff-match-patch") {
-    sonarqube {
+    sonar {
         skipProject = true
     }
 }
 
 //project(":matrix-sdk-android") {
-//    sonarqube {
+//    sonar {
 //        properties {
 //            property "sonar.sources", project(":matrix-sdk-android").android.sourceSets.main.java.srcDirs
 //            // exclude source code from analyses separated by a colon (:)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/WorkManagerProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/WorkManagerProvider.kt
@@ -41,7 +41,7 @@ internal class WorkManagerProvider @Inject constructor(
         private val coroutineDispatchers: MatrixCoroutineDispatchers,
         private val sessionScope: CoroutineScope
 ) {
-    private val tag = MATRIX_SDK_TAG_PREFIX + sessionId
+    val tag = MATRIX_SDK_TAG_PREFIX + sessionId
 
     val workManager = WorkManager.getInstance(context)
 

diff --git a/...ix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeWorkManagerProvider.kt b/...ix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeWorkManagerProvider.kt
@@ -26,5 +26,6 @@ internal class FakeWorkManagerProvider(
 
     val instance = mockk<WorkManagerProvider>().also {
         every { it.workManager } returns fakeWorkManager.instance
+        every { it.tag } returns "Tag"
     }
 }