From dce24a8ec5956d242d4911729d279b7c3cf63ebc Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Mon, 20 Sep 2021 21:58:45 +0200 Subject: [PATCH 1/2] change test builds to 'Kodi Matrix' --- .github/workflows/build.yml | 6 +++--- .travis.yml | 6 +++--- README.md | 6 +++--- appveyor.yml | 2 +- azure-pipelines.yml | 3 ++- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0103daf..e32c4a1 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 screensaver.shadertoy 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 d651287..fa86e3f 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 install fakeroot; fi - if [[ $DEBIAN_BUILD != true ]] && [[ $TRAVIS_OS_NAME == linux ]]; then sudo apt-get install -y libgl1-mesa-dev; 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 3036296..fa4e232 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ This is a [Kodi](https://kodi.tv) screensaver addon. ## Build instructions When building the addon you have to use the correct branch depending on which version of Kodi you're building against. -If you want to build the addon to be compatible with the latest kodi `master` commit, you need to checkout the branch with the current kodi codename. +If you want to build the addon to be compatible with the latest kodi `Matrix` commit, you need to checkout the branch with the current kodi codename. Also make sure you follow this README from the branch in question. ### Linux @@ -19,8 +19,8 @@ Also make sure you follow this README from the branch in question. The following instructions assume you will have built Kodi already in the `kodi-build` directory suggested by the README. -1. `git clone --branch master https://github.com/xbmc/xbmc.git` -2. `git clone https://github.com/xbmc/screensaver.shadertoy.git` +1. `git clone --branch Matrix https://github.com/xbmc/xbmc.git` +2. `git clone --branch Matrix https://github.com/xbmc/screensaver.shadertoy.git` 3. `cd screensaver.shadertoy && mkdir build && cd build` 4. `cmake -DADDONS_TO_BUILD=screensaver.shadertoy -DADDON_SRC_PREFIX=../.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../../xbmc/kodi-build/addons -DPACKAGE_ZIP=1 ../../xbmc/cmake/addons` 5. `make` diff --git a/appveyor.yml b/appveyor.yml index a0dd6d2..87c767b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -25,7 +25,7 @@ environment: build_script: - cd .. - - git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git + - git clone --branch Matrix --depth=1 https://github.com/xbmc/xbmc.git - cd %app_id% - mkdir build - cd build diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e5ca1cb..d178b32 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -5,6 +5,7 @@ trigger: branches: include: - Matrix + - Nexus - releases/* paths: include: @@ -48,7 +49,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 adc409d9f211648bee1fd711e23d230def7fa22d Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Mon, 20 Sep 2021 21:58:45 +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. --- screensaver.shadertoy/addon.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/screensaver.shadertoy/addon.xml.in b/screensaver.shadertoy/addon.xml.in index aa62259..38bb231 100644 --- a/screensaver.shadertoy/addon.xml.in +++ b/screensaver.shadertoy/addon.xml.in @@ -1,7 +1,7 @@  @ADDON_DEPENDS@