From 698997a5195f2135aa86f95c0072e86afbc5681c Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Sat, 18 Sep 2021 20:30:48 +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 | 6 +++--- azure-pipelines.yml | 1 + 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/changelog-and-release.yml b/.github/workflows/changelog-and-release.yml index e3d3b4e4..c952b584 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 f413289a..0e126881 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 3d3080aa..874d461c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1 +1 @@ -buildPlugin(version: "Matrix") +buildPlugin(version: "Nexus") diff --git a/README.md b/README.md index 2f9dc6ba..9c565e81 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,9 @@ This is a [Kodi](https://kodi.tv) PVR addon for connecting to a [tvheadend](https://tvheadend.org) backend. [![License: GPL-2.0-or-later](https://img.shields.io/badge/License-GPL%20v2+-blue.svg)](LICENSE.md) -[![Build and run tests](https://github.com/kodi-pvr/pvr.hts/actions/workflows/build.yml/badge.svg?branch=Matrix)](https://github.com/kodi-pvr/pvr.hts/actions/workflows/build.yml) -[![Build Status](https://dev.azure.com/teamkodi/kodi-pvr/_apis/build/status/kodi-pvr.pvr.hts?branchName=Matrix)](https://dev.azure.com/teamkodi/kodi-pvr/_build/latest?definitionId=62&branchName=Matrix) -[![Build Status](https://jenkins.kodi.tv/view/Addons/job/kodi-pvr/job/pvr.hts/job/Matrix/badge/icon)](https://jenkins.kodi.tv/blue/organizations/jenkins/kodi-pvr%2Fpvr.hts/branches/) +[![Build and run tests](https://github.com/kodi-pvr/pvr.hts/actions/workflows/build.yml/badge.svg?branch=Nexus)](https://github.com/kodi-pvr/pvr.hts/actions/workflows/build.yml) +[![Build Status](https://dev.azure.com/teamkodi/kodi-pvr/_apis/build/status/kodi-pvr.pvr.hts?branchName=Nexus)](https://dev.azure.com/teamkodi/kodi-pvr/_build/latest?definitionId=62&branchName=Nexus) +[![Build Status](https://jenkins.kodi.tv/view/Addons/job/kodi-pvr/job/pvr.hts/job/Nexus/badge/icon)](https://jenkins.kodi.tv/blue/organizations/jenkins/kodi-pvr%2Fpvr.hts/branches/) [![Coverity Scan Build Status](https://scan.coverity.com/projects/5120/badge.svg)](https://scan.coverity.com/projects/5120) ## Build instructions diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e541228a..7eeaab83 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -5,6 +5,7 @@ trigger: branches: include: - Matrix + - Nexus - releases/* paths: include: From f7fdbd4fc15c00cb93c730e9ae6ec16735a544b3 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Sat, 18 Sep 2021 20:26:47 +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.hts/addon.xml.in | 2 +- pvr.hts/changelog.txt | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/pvr.hts/addon.xml.in b/pvr.hts/addon.xml.in index 258dbaf4..a499e876 100644 --- a/pvr.hts/addon.xml.in +++ b/pvr.hts/addon.xml.in @@ -1,7 +1,7 @@ @ADDON_DEPENDS@ diff --git a/pvr.hts/changelog.txt b/pvr.hts/changelog.txt index 66efa9c4..7d9177c8 100644 --- a/pvr.hts/changelog.txt +++ b/pvr.hts/changelog.txt @@ -1,3 +1,11 @@ +v20.0.0 +- Translations updates from Weblate + - ko_kr +- Changed test builds to 'Kodi 20 Nexus' +- Increased version to 20.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. + v8.4.0 - Add support for RDS data contained in AAC streams. - Translations updates from Weblate