From 91cc13be176986fd45f116ed6dd9c56e80b67c33 Mon Sep 17 00:00:00 2001
From: ksooo <3226626+ksooo@users.noreply.github.com>
Date: Sun, 5 Nov 2023 16:48:57 +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 ffcbe2f2..1b1f569a 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.vuplus repo
+    - name: Checkout add-on repo
       uses: actions/checkout@v2
       with:
         path: ${{ env.app_id }}

From cfd311dacbcda51fcdff4cead37ab0ead1420c7e Mon Sep 17 00:00:00 2001
From: ksooo <3226626+ksooo@users.noreply.github.com>
Date: Sun, 5 Nov 2023 16:49:04 +0100
Subject: [PATCH 2/4] Azure build pipelines: Add Omega to trigger branches

---
 azure-pipelines.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 728c7bd4..56a89fab 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -4,7 +4,9 @@ variables:
 trigger:
   branches:
     include:
+    - Matrix
     - Nexus
+    - Omega
     - releases/*
   paths:
     include:

From 7c1206dd0bf08b3aad9708610f0716ac9df3c9a8 Mon Sep 17 00:00:00 2001
From: ksooo <3226626+ksooo@users.noreply.github.com>
Date: Sun, 5 Nov 2023 19:45:12 +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 f95d5413..f5dc9362 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 7dc1e0c0..3ea33873 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 37db4c4b88e4615328462c8da9c50d8de9f0fa69 Mon Sep 17 00:00:00 2001
From: ksooo <3226626+ksooo@users.noreply.github.com>
Date: Sun, 5 Nov 2023 19:45:12 +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 de2b2627..72c01ed1 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![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.vuplus/actions/workflows/build.yml/badge.svg?branch=Nexus)](https://github.com/kodi-pvr/pvr.vuplus/actions/workflows/build.yml)
-[![Build Status](https://dev.azure.com/teamkodi/kodi-pvr/_apis/build/status/kodi-pvr.pvr.vuplus?branchName=Nexus)](https://dev.azure.com/teamkodi/kodi-pvr/_build/latest?definitionId=68&branchName=Nexus)
-[![Build Status](https://jenkins.kodi.tv/view/Addons/job/kodi-pvr/job/pvr.vuplus/job/Nexus/badge/icon)](https://jenkins.kodi.tv/blue/organizations/jenkins/kodi-pvr%2Fpvr.vuplus/branches/)
+[![Build and run tests](https://github.com/kodi-pvr/pvr.vuplus/actions/workflows/build.yml/badge.svg?branch=Omega)](https://github.com/kodi-pvr/pvr.vuplus/actions/workflows/build.yml)
+[![Build Status](https://dev.azure.com/teamkodi/kodi-pvr/_apis/build/status/kodi-pvr.pvr.vuplus?branchName=Omega)](https://dev.azure.com/teamkodi/kodi-pvr/_build/latest?definitionId=68&branchName=Omega)
+[![Build Status](https://jenkins.kodi.tv/view/Addons/job/kodi-pvr/job/pvr.vuplus/job/Omega/badge/icon)](https://jenkins.kodi.tv/blue/organizations/jenkins/kodi-pvr%2Fpvr.vuplus/branches/)
 [![Coverity Scan Build Status](https://scan.coverity.com/projects/5120/badge.svg)](https://scan.coverity.com/projects/5120)
 
 # Enigma2 PVR