From 4a89b9d0130927fe40b17df7bf4560b7264a4541 Mon Sep 17 00:00:00 2001 From: ksooo <3226626+ksooo@users.noreply.github.com> Date: Sun, 5 Nov 2023 12:18:11 +0100 Subject: [PATCH 1/4] GitHub Actions: Debian build job: switch actions runner from ubuntu-18.04 to ubuntu-latest --- .github/workflows/build.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 35724e82..af7e01c9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,17 +11,10 @@ jobs: matrix: include: - name: "Debian package test" - os: ubuntu-18.04 + os: ubuntu-latest CC: gcc CXX: g++ DEBIAN_BUILD: true - #- os: ubuntu-18.04 - #CC: gcc - #CXX: g++ - #- os: ubuntu-18.04 - #CC: clang - #CXX: clang++ - #- os: macos-10.15 steps: - name: Install needed ubuntu depends env: @@ -36,7 +29,7 @@ jobs: repository: xbmc/xbmc ref: master path: xbmc - - name: Checkout pvr.hts repo + - name: Checkout add-on repo uses: actions/checkout@v2 with: path: ${{ env.app_id }} From dc1bef0b562b1508600a79fe389fbef340bf5680 Mon Sep 17 00:00:00 2001 From: ksooo <3226626+ksooo@users.noreply.github.com> Date: Sun, 5 Nov 2023 12:28:18 +0100 Subject: [PATCH 2/4] Azure build pipelines: Add Omega to trigger branches --- azure-pipelines.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2424f9b2..fc16d70a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -6,6 +6,7 @@ trigger: include: - Matrix - Nexus + - Omega - releases/* paths: include: From 395fb0a958d7747b2a30b9aa26d868870e8de38c Mon Sep 17 00:00:00 2001 From: ksooo <3226626+ksooo@users.noreply.github.com> Date: Sun, 5 Nov 2023 18:03:08 +0100 Subject: [PATCH 3/4] GitHub Actions: Add Omega branch to 'Increment add-on version when languages are updated' and 'Sync addon metadata translations'. --- .github/workflows/increment-version.yml | 2 +- .github/workflows/sync-addon-metadata-translations.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/increment-version.yml b/.github/workflows/increment-version.yml index 51d8dcac..c6980f85 100644 --- a/.github/workflows/increment-version.yml +++ b/.github/workflows/increment-version.yml @@ -2,7 +2,7 @@ name: Increment version when languages are updated on: push: - branches: [ Matrix, Nexus ] + branches: [ Matrix, Nexus, Omega ] paths: - '**resource.language.**strings.po' diff --git a/.github/workflows/sync-addon-metadata-translations.yml b/.github/workflows/sync-addon-metadata-translations.yml index c79d2567..cb54179c 100644 --- a/.github/workflows/sync-addon-metadata-translations.yml +++ b/.github/workflows/sync-addon-metadata-translations.yml @@ -2,7 +2,7 @@ name: Sync addon metadata translations on: push: - branches: [ Matrix, Nexus ] + branches: [ Matrix, Nexus, Omega ] paths: - '**addon.xml.in' - '**resource.language.**strings.po' From c2afbb5af5c48656cf86be2cc0926395762e1d2c Mon Sep 17 00:00:00 2001 From: ksooo <3226626+ksooo@users.noreply.github.com> Date: Sun, 5 Nov 2023 18:05:51 +0100 Subject: [PATCH 4/4] README.md: Fix build status badges to use Omega branch. --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 9c565e81..7d75baf0 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=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/) +[![Build and run tests](https://github.com/kodi-pvr/pvr.hts/actions/workflows/build.yml/badge.svg?branch=Omega)](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=Omega)](https://dev.azure.com/teamkodi/kodi-pvr/_build/latest?definitionId=62&branchName=Omege) +[![Build Status](https://jenkins.kodi.tv/view/Addons/job/kodi-pvr/job/pvr.hts/job/Omega/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