Skip to content

Commit

Permalink
Merge pull request #439 from ksooo/fix-merge-tests
Browse files Browse the repository at this point in the history
[Omega] GitHub Actions/Azure build pipeline fixes/updates
  • Loading branch information
ksooo authored Nov 6, 2023
2 parents deabc33 + 37db4c4 commit 8b1b779
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 14 deletions.
11 changes: 2 additions & 9 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/increment-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sync-addon-metadata-translations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 2 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ variables:
trigger:
branches:
include:
- Matrix
- Nexus
- Omega
- releases/*
paths:
include:
Expand Down

0 comments on commit 8b1b779

Please sign in to comment.