From 705830d03455dba022329b5ac3a55fb22a2955e7 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Fri, 17 Sep 2021 17:58:26 +0200 Subject: [PATCH 1/2] change test builds to 'Kodi Matrix' --- .github/workflows/build.yml | 6 +++--- .travis.yml | 6 +++--- README.md | 4 ++-- azure-pipelines.yml | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cadb5732..53749c32 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,14 +27,14 @@ jobs: env: DEBIAN_BUILD: ${{ matrix.DEBIAN_BUILD }} run: | - if [[ $DEBIAN_BUILD == true ]]; then sudo add-apt-repository -y ppa:team-xbmc/xbmc-nightly; fi + if [[ $DEBIAN_BUILD == true ]]; then sudo add-apt-repository -y ppa:team-xbmc/ppa; fi if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get update; fi if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get install fakeroot; fi - name: Checkout Kodi repo uses: actions/checkout@v2 with: repository: xbmc/xbmc - ref: master + ref: Matrix path: xbmc - name: Checkout pvr.stalker repo uses: actions/checkout@v2 @@ -48,7 +48,7 @@ jobs: run: | if [[ $DEBIAN_BUILD != true ]]; then cd ${app_id} && mkdir -p build && cd build; fi if [[ $DEBIAN_BUILD != true ]]; then cmake -DADDONS_TO_BUILD=${app_id} -DADDON_SRC_PREFIX=${{ github.workspace }} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/xbmc/addons -DPACKAGE_ZIP=1 ${{ github.workspace }}/xbmc/cmake/addons; fi - if [[ $DEBIAN_BUILD == true ]]; then wget https://raw.githubusercontent.com/xbmc/xbmc/master/xbmc/addons/kodi-dev-kit/tools/debian-addon-package-test.sh && chmod +x ./debian-addon-package-test.sh; fi + if [[ $DEBIAN_BUILD == true ]]; then wget https://raw.githubusercontent.com/xbmc/xbmc/Matrix/xbmc/addons/kodi-dev-kit/tools/debian-addon-package-test.sh && chmod +x ./debian-addon-package-test.sh; fi if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get build-dep ${{ github.workspace }}/${app_id}; fi - name: Build env: diff --git a/.travis.yml b/.travis.yml index 430a9f16..f1b5b134 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,7 @@ matrix: osx_image: xcode10.2 before_install: - - if [[ $DEBIAN_BUILD == true ]]; then sudo add-apt-repository -y ppa:team-xbmc/xbmc-nightly; fi + - if [[ $DEBIAN_BUILD == true ]]; then sudo add-apt-repository -y ppa:team-xbmc/ppa; fi - if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get update; fi - if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get install fakeroot; fi @@ -41,12 +41,12 @@ before_install: # before_script: - if [[ $DEBIAN_BUILD != true ]]; then cd $TRAVIS_BUILD_DIR/..; fi - - if [[ $DEBIAN_BUILD != true ]]; then git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git; fi + - if [[ $DEBIAN_BUILD != true ]]; then git clone --branch Matrix --depth=1 https://github.com/xbmc/xbmc.git; fi - if [[ $DEBIAN_BUILD != true ]]; then cd ${app_id} && mkdir build && cd build; fi - if [[ $DEBIAN_BUILD != true ]]; then mkdir -p definition/${app_id}; fi - if [[ $DEBIAN_BUILD != true ]]; then echo ${app_id} $TRAVIS_BUILD_DIR $TRAVIS_COMMIT > definition/${app_id}/${app_id}.txt; fi - if [[ $DEBIAN_BUILD != true ]]; then cmake -DADDONS_TO_BUILD=${app_id} -DADDON_SRC_PREFIX=$TRAVIS_BUILD_DIR/.. -DADDONS_DEFINITION_DIR=$TRAVIS_BUILD_DIR/build/definition -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/../xbmc/addons -DPACKAGE_ZIP=1 $TRAVIS_BUILD_DIR/../xbmc/cmake/addons; fi - - if [[ $DEBIAN_BUILD == true ]]; then wget https://raw.githubusercontent.com/xbmc/xbmc/master/xbmc/addons/kodi-dev-kit/tools/debian-addon-package-test.sh && chmod +x ./debian-addon-package-test.sh; fi + - if [[ $DEBIAN_BUILD == true ]]; then wget https://raw.githubusercontent.com/xbmc/xbmc/Matrix/xbmc/addons/kodi-dev-kit/tools/debian-addon-package-test.sh && chmod +x ./debian-addon-package-test.sh; fi - if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get build-dep $TRAVIS_BUILD_DIR; fi script: diff --git a/README.md b/README.md index 1cc76b0d..c96a01df 100644 --- a/README.md +++ b/README.md @@ -11,8 +11,8 @@ Stalker Middleware PVR client addon for [Kodi](https://kodi.tv) ### Linux -1. `git clone --branch master https://github.com/xbmc/xbmc.git` -2. `git clone https://github.com/kodi-pvr/pvr.stalker.git` +1. `git clone --branch Matrix https://github.com/xbmc/xbmc.git` +2. `git clone --branch Matrix https://github.com/kodi-pvr/pvr.stalker.git` 3. `cd pvr.stalker && mkdir build && cd build` 4. `cmake -DADDONS_TO_BUILD=pvr.stalker -DADDON_SRC_PREFIX=../.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../../xbmc/addons -DPACKAGE_ZIP=1 ../../xbmc/cmake/addons` 5. `make` diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 228cf943..cb483661 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -46,7 +46,7 @@ jobs: - script: | cd .. - git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git kodi + git clone --branch Matrix --depth=1 https://github.com/xbmc/xbmc.git kodi cd $(Build.SourcesDirectory) mkdir build cd build From 02c9c0f7c6f33f0864d0a181175473ebc13c0d9f Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Fri, 17 Sep 2021 18:00:37 +0200 Subject: [PATCH 2/2] increase version to 19.0.0 (see note below) With start of Kodi 20 Nexus, takes addon as major the same version number as Kodi. This done to know easier to which Kodi the addon works. For here now used by Kodi 19 Matrix. --- pvr.stalker/addon.xml.in | 2 +- pvr.stalker/changelog.txt | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pvr.stalker/addon.xml.in b/pvr.stalker/addon.xml.in index 1de5919a..cd951bc6 100644 --- a/pvr.stalker/addon.xml.in +++ b/pvr.stalker/addon.xml.in @@ -1,7 +1,7 @@ @ADDON_DEPENDS@ diff --git a/pvr.stalker/changelog.txt b/pvr.stalker/changelog.txt index 50cdf5a7..2478b0f8 100644 --- a/pvr.stalker/changelog.txt +++ b/pvr.stalker/changelog.txt @@ -1,3 +1,13 @@ +v19.0.0 +- Translations updates from Weblate + - Danish (da_dk) + - To allow also addon.xml content update by Weblate +- Minor cleanups on addon.xml +- Changed test builds to 'Kodi 19 Matrix' +- Increased version to 19.0.0 + - With start of Kodi 20 Nexus, takes addon as major the same version number as Kodi. + This done to know easier to which Kodi the addon works. + v7.1.1 - Language update from Weblate