Skip to content

Commit d5c9692

Browse files
authored
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.
1 parent bb7d9e5 commit d5c9692

2 files changed

Lines changed: 13 additions & 20 deletions

File tree

.github/workflows/addon-check.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
name: Kodi
22
on:
3-
push:
4-
branches:
5-
- master
6-
pull_request:
7-
branches:
8-
- master
3+
- pull_request
4+
- push
95
jobs:
106
tests:
117
name: Addon checker
@@ -26,7 +22,9 @@ jobs:
2622
run: |
2723
sudo apt-get install libxml2-utils xmlstarlet
2824
python -m pip install --upgrade pip
29-
pip install kodi-addon-checker
25+
# FIXME: Requires changes from xbmc/addon-check#217
26+
#pip install kodi-addon-checker
27+
pip install git+git://github.com/dagwieers/addon-check.git@retry-repo#egg=kodi-addon-checker
3028
- name: Remove unwanted files
3129
run: awk '/export-ignore/ { print $1 }' .gitattributes | xargs rm -rf --
3230
working-directory: ${{ github.repository }}

.github/workflows/ci.yml

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -53,20 +53,15 @@ jobs:
5353
- name: Upload code coverage to CodeCov
5454
uses: codecov/codecov-action@v1
5555
continue-on-error: true
56-
- name: Prepare for SonarCloud
57-
run: |
58-
cat <<EOF >sonar-project.properties
59-
sonar.language=python
60-
sonar.organization=add-ons
61-
sonar.python.coverage.reportPaths=coverage.xml
62-
sonar.projectKey=add-ons_plugin.video.vrt.nu
63-
sonar.pullrequest.provider=GitHub
64-
sonar.sourceEncoding=UTF-8
65-
sonar.sources=resources/lib
66-
sonar.test.exclusions=tests/**
67-
EOF
56+
# FIXME: Requires changes from SonarSource/sonarcloud-github-action#9
6857
- name: Analyze with SonarCloud
69-
uses: sonarsource/sonarcloud-github-action@master
58+
uses: dagwieers/sonarcloud-github-action@more-options
59+
with:
60+
organization: add-ons
61+
projectKey: add-ons_plugin.video.vrt.nu
62+
sources: resources/lib/
63+
tests: tests/
64+
verbose: true
7065
env:
7166
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7267
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

0 commit comments

Comments
 (0)