Skip to content

Commit

Permalink
Merge pull request #191 from dagwieers/release-v1.1.1
Browse files Browse the repository at this point in the history
Prepare for v1.1.1 release (the sequel)
  • Loading branch information
dagwieers committed Jun 21, 2020
2 parents c86ed04 + 3146bf6 commit 9bf6a06
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 14 deletions.
15 changes: 11 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,27 +28,34 @@ jobs:
pip install -r requirements.txt
- name: Run tox
run: python -m tox -q -e flake8,py
if: always()
- name: Run pylint
run: python -m pylint resources/lib/ tests/
if: always()
- name: Compare translations
run: make check-translations
if: always()
- name: Run unit tests
run: coverage run -m unittest discover
if: always()
- name: Run script entry
run: coverage run -a resources/lib/script_entry.py
if: always()
- name: Run service entry
run: coverage run -a resources/lib/service_entry.py &
if: always()
- name: Upload code coverage to CodeCov
uses: codecov/codecov-action@v1
continue-on-error: true
# FIXME: Requires changes from SonarSource/sonarcloud-github-action#9
- name: Analyze with SonarCloud
uses: dagwieers/sonarcloud-github-action@more-options
with:
organization: add-ons
projectKey: add-ons_service.upnext
sources: resources/lib/
tests: tests/
args: >
-Dsonar.organization=im85288
-Dsonar.projectKey=im85288_service.upnext
-Dsonar.sources=resources/lib/
-Dsonar.tests=tests/
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
run: |
sudo apt-get install libxml2-utils
make multizip release=1
- name: Get Krypton filename
id: get-krypton-filename
- name: Get Leia filename
id: get-leia-filename
run: |
echo ::set-output name=krypton-filename::$(cd ..;ls service.upnext*.zip | grep -v '+matrix.' | head -1)
echo ::set-output name=leia-filename::$(cd ..;ls service.upnext*.zip | grep -v '+matrix.' | head -1)
- name: Get Matrix filename
id: get-matrix-filename
run: |
Expand All @@ -42,15 +42,15 @@ jobs:
body: ${{ steps.get-body.outputs.body }}
draft: false
prerelease: false
- name: Upload Krypton/Leia zip
id: upload-krypton-zip
- name: Upload Leia zip
id: upload-leia-zip
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_name: ${{ steps.get-krypton-filename.outputs.krypton-filename }}
asset_path: ../${{ steps.get-krypton-filename.outputs.krypton-filename }}
asset_name: ${{ steps.get-leia-filename.outputs.leia-filename }}
asset_path: ../${{ steps.get-leia-filename.outputs.leia-filename }}
asset_content_type: application/zip
- name: Upload Matrix zip
id: upload-matrix-zip
Expand All @@ -67,7 +67,7 @@ jobs:
uses: xbmc/action-kodi-addon-submitter@v1.2
with:
kodi-repository: repo-plugins
kodi-version: krypton
kodi-version: leia
addon-id: service.upnext
kodi-matrix: true
env:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ The add-on has various settings to fine-tune the experience, however the default
For [Addon Integration](https://github.com/im85288/service.upnext/wiki/Addon-Integration) and [Skinners](https://github.com/im85288/service.upnext/wiki/Skinners) see the [wiki](https://github.com/im85288/service.upnext/wiki)

## Releases
### v1.1.1 (2020-05-XX)
### v1.1.1 (2020-06-21)
- Avoid conflict with external players (@BrutuZ)
- Restore "Ignore Playlist" option (@BrutuZ)
- Fix a known Kodi bug related to displaying hours (@Maven85)
Expand Down
2 changes: 1 addition & 1 deletion addon.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Många befintliga tillägg integreras redan med den här utanför lådan-tjänst
<platform>all</platform>
<license>GPL-2.0-only</license>
<news>
### v1.1.1 (2020-05-XX)
### v1.1.1 (2020-06-21)
- Avoid conflict with external players
- Restore "Ignore Playlist" option
- Fix a known Kodi bug related to displaying hours
Expand Down

0 comments on commit 9bf6a06

Please sign in to comment.