From d5c9692a10a38a2edd63aac3e248f14edac9d684 Mon Sep 17 00:00:00 2001
From: Dag Wieers <dag@wieers.com>
Date: Fri, 27 Mar 2020 01:06:39 +0100
Subject: [PATCH] Use SonarCloud and Kodi addon-check fixes (#713)

This uses the newer options in the proposed SonarCloud pull-request and
reliability fixes in Kodi's addon-checker.
---
 .github/workflows/addon-check.yml | 12 +++++-------
 .github/workflows/ci.yml          | 21 ++++++++-------------
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/addon-check.yml b/.github/workflows/addon-check.yml
index 6988fe82..665a474e 100644
--- a/.github/workflows/addon-check.yml
+++ b/.github/workflows/addon-check.yml
@@ -1,11 +1,7 @@
 name: Kodi
 on:
-  push:
-    branches:
-    - master
-  pull_request:
-    branches:
-    - master
+- pull_request
+- push
 jobs:
   tests:
     name: Addon checker
@@ -26,7 +22,9 @@ jobs:
       run: |
         sudo apt-get install libxml2-utils xmlstarlet
         python -m pip install --upgrade pip
-        pip install kodi-addon-checker
+        # FIXME: Requires changes from xbmc/addon-check#217
+        #pip install kodi-addon-checker
+        pip install git+git://github.com/dagwieers/addon-check.git@retry-repo#egg=kodi-addon-checker
     - name: Remove unwanted files
       run: awk '/export-ignore/ { print $1 }' .gitattributes | xargs rm -rf --
       working-directory: ${{ github.repository }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e1374a9b..a1f055e9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -53,20 +53,15 @@ jobs:
     - name: Upload code coverage to CodeCov
       uses: codecov/codecov-action@v1
       continue-on-error: true
-    - name: Prepare for SonarCloud
-      run: |
-        cat <<EOF >sonar-project.properties
-        sonar.language=python
-        sonar.organization=add-ons
-        sonar.python.coverage.reportPaths=coverage.xml
-        sonar.projectKey=add-ons_plugin.video.vrt.nu
-        sonar.pullrequest.provider=GitHub
-        sonar.sourceEncoding=UTF-8
-        sonar.sources=resources/lib
-        sonar.test.exclusions=tests/**
-        EOF
+    # FIXME: Requires changes from SonarSource/sonarcloud-github-action#9
     - name: Analyze with SonarCloud
-      uses: sonarsource/sonarcloud-github-action@master
+      uses: dagwieers/sonarcloud-github-action@more-options
+      with:
+        organization: add-ons
+        projectKey: add-ons_plugin.video.vrt.nu
+        sources: resources/lib/
+        tests: tests/
+        verbose: true
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}