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

Fix CI
This commit is contained in:
Benoit Marty 2023-03-03 21:14:16 +01:00 committed by GitHub
commit 97b47302ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 7 deletions

View File

@ -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()

View File

@ -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 (:)

View File

@ -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)

View File

@ -26,5 +26,6 @@ internal class FakeWorkManagerProvider(
val instance = mockk<WorkManagerProvider>().also {
every { it.workManager } returns fakeWorkManager.instance
every { it.tag } returns "Tag"
}
}