From bacefe5194256dc75b718153513960a562b074df Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Sun, 19 Sep 2021 09:56:27 +0200 Subject: [PATCH 1/2] change test builds to 'Kodi Nexus' --- .github/workflows/changelog-and-release.yml | 2 +- .github/workflows/release.yml | 2 +- Jenkinsfile | 2 +- README.md | 2 +- appveyor.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/changelog-and-release.yml b/.github/workflows/changelog-and-release.yml index e3d3b4e..c952b58 100644 --- a/.github/workflows/changelog-and-release.yml +++ b/.github/workflows/changelog-and-release.yml @@ -133,7 +133,7 @@ jobs: shell: bash # Create a release at {steps.required-variables.outputs.branch} - # - tag and release name format: {steps.required-variables.outputs.version}-{steps.required-variables.outputs.branch} ie. 1.0.0-Matrix + # - tag and release name format: {steps.required-variables.outputs.version}-{steps.required-variables.outputs.branch} ie. 20.0.0-Nexus # - release body: {steps.required-variables.outputs.changes} - name: Create Release id: create-release diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f413289..0e12688 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -50,7 +50,7 @@ jobs: working-directory: ${{ github.event.repository.name }} # Create a release at {steps.required-variables.outputs.branch} - # - tag and release name format: {steps.required-variables.outputs.version}-{steps.required-variables.outputs.branch} ie. 1.0.0-Matrix + # - tag and release name format: {steps.required-variables.outputs.version}-{steps.required-variables.outputs.branch} ie. 20.0.0-Nexus # - release body: {steps.required-variables.outputs.changes} - name: Create Release id: create-release diff --git a/Jenkinsfile b/Jenkinsfile index 3d3080a..874d461 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1 +1 @@ -buildPlugin(version: "Matrix") +buildPlugin(version: "Nexus") diff --git a/README.md b/README.md index ba20b1f..42cf62a 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Digital Devices [Octonet](http://www.digital-devices.eu/shop/de/netzwerk-tv/) PV | Platform | Status | |----------|--------| -| Linux + OS X (github) | [![Build and run tests](https://github.com/kodi-pvr/pvr.octonet/actions/workflows/build.yml/badge.svg?branch=Matrix)](https://github.com/kodi-pvr/pvr.octonet/actions/workflows/build.yml) | +| Linux + OS X (github) | [![Build and run tests](https://github.com/kodi-pvr/pvr.octonet/actions/workflows/build.yml/badge.svg?branch=Nexus)](https://github.com/kodi-pvr/pvr.octonet/actions/workflows/build.yml) | | Windows (AppVeyor) | [![Build status](https://ci.appveyor.com/api/projects/status/m7dhmpmuf5coir5h?svg=true)](https://ci.appveyor.com/project/julianscheel/pvr-octonet) | # Building diff --git a/appveyor.yml b/appveyor.yml index c4ec03a..d5389b3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -23,7 +23,7 @@ environment: build_script: - cd .. - - git clone --branch Matrix --depth=1 https://github.com/xbmc/xbmc.git + - git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git - cd %app_id% - mkdir build - cd build From df13aef650e39bd0fe3f093efbe4b6ca3461cedc Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Sun, 19 Sep 2021 09:56:56 +0200 Subject: [PATCH 2/2] increase version to 20.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 20 Nexus. --- pvr.octonet/addon.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pvr.octonet/addon.xml.in b/pvr.octonet/addon.xml.in index da3bdc8..0b47cb2 100644 --- a/pvr.octonet/addon.xml.in +++ b/pvr.octonet/addon.xml.in @@ -1,7 +1,7 @@ @ADDON_DEPENDS@