Skip to content

Commit f0bd058

Browse files
authored
Merge pull request #38 from AlwinEsch/Nexus-change
[Nexus] change test builds to Kodi Nexus and add github workflow about Debian build test
2 parents 0e54eb7 + d0e2ab3 commit f0bd058

File tree

6 files changed

+75
-6
lines changed

6 files changed

+75
-6
lines changed

.github/workflows/build.yml

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
name: Build and run tests
2+
on: [push, pull_request]
3+
env:
4+
app_id: audiodecoder.sacd
5+
6+
jobs:
7+
build:
8+
runs-on: ${{ matrix.os }}
9+
strategy:
10+
fail-fast: false
11+
matrix:
12+
include:
13+
- name: "Debian package test"
14+
os: ubuntu-18.04
15+
CC: gcc
16+
CXX: g++
17+
DEBIAN_BUILD: true
18+
#- os: ubuntu-18.04
19+
#CC: gcc
20+
#CXX: g++
21+
#- os: ubuntu-18.04
22+
#CC: clang
23+
#CXX: clang++
24+
#- os: macos-10.15
25+
steps:
26+
- name: Install needed ubuntu depends
27+
env:
28+
DEBIAN_BUILD: ${{ matrix.DEBIAN_BUILD }}
29+
run: |
30+
if [[ $DEBIAN_BUILD == true ]]; then sudo add-apt-repository -y ppa:team-xbmc/xbmc-nightly; fi
31+
if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get update; fi
32+
if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get install fakeroot; fi
33+
- name: Checkout Kodi repo
34+
uses: actions/checkout@v2
35+
with:
36+
repository: xbmc/xbmc
37+
ref: master
38+
path: xbmc
39+
- name: Checkout audiodecoder.sacd repo
40+
uses: actions/checkout@v2
41+
with:
42+
path: ${{ env.app_id }}
43+
- name: Configure
44+
env:
45+
CC: ${{ matrix.CC }}
46+
CXX: ${{ matrix.CXX }}
47+
DEBIAN_BUILD: ${{ matrix.DEBIAN_BUILD }}
48+
run: |
49+
if [[ $DEBIAN_BUILD != true ]]; then cd ${app_id} && mkdir -p build && cd build; fi
50+
if [[ $DEBIAN_BUILD != true ]]; then cmake -DADDONS_TO_BUILD=${app_id} -DADDON_SRC_PREFIX=${{ github.workspace }} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/xbmc/addons -DPACKAGE_ZIP=1 ${{ github.workspace }}/xbmc/cmake/addons; fi
51+
if [[ $DEBIAN_BUILD == true ]]; then wget https://raw.githubusercontent.com/xbmc/xbmc/master/xbmc/addons/kodi-dev-kit/tools/debian-addon-package-test.sh && chmod +x ./debian-addon-package-test.sh; fi
52+
if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get build-dep ${{ github.workspace }}/${app_id}; fi
53+
- name: Build
54+
env:
55+
CC: ${{ matrix.CC }}
56+
CXX: ${{ matrix.CXX }}
57+
DEBIAN_BUILD: ${{ matrix.DEBIAN_BUILD }}
58+
run: |
59+
if [[ $DEBIAN_BUILD != true ]]; then cd ${app_id}/build; fi
60+
if [[ $DEBIAN_BUILD != true ]]; then make; fi
61+
if [[ $DEBIAN_BUILD == true ]]; then ./debian-addon-package-test.sh ${{ github.workspace }}/${app_id}; fi

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
buildPlugin(version: "Matrix")
1+
buildPlugin(version: "Nexus")

README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
------------------
66

77
[![License: GPL-2.0-or-later](https://img.shields.io/badge/License-GPL%20v2+-blue.svg)](LICENSE.md)
8-
[![Build Status](https://dev.azure.com/teamkodi/binary-addons/_apis/build/status/xbmc.audiodecoder.sacd?branchName=Matrix)](https://dev.azure.com/teamkodi/binary-addons/_build/latest?definitionId=74&branchName=Matrix)
9-
[![Build Status](https://jenkins.kodi.tv/view/Addons/job/xbmc/job/audiodecoder.sacd/job/Matrix/badge/icon)](https://jenkins.kodi.tv/blue/organizations/jenkins/xbmc%2Faudiodecoder.sacd/branches/)
10-
<!--- [![Build Status](https://ci.appveyor.com/api/projects/status/github/xbmc/audiodecoder.sacd?branch=Matrix&svg=true)](https://ci.appveyor.com/project/xbmc/audiodecoder-sacd?branch=Matrix) -->
8+
[![Build and run tests](https://github.com/xbmc/audiodecoder.sacd/actions/workflows/build.yml/badge.svg?branch=Nexus)](https://github.com/xbmc/audiodecoder.sacd/actions/workflows/build.yml)
9+
[![Build Status](https://dev.azure.com/teamkodi/binary-addons/_apis/build/status/xbmc.audiodecoder.sacd?branchName=Nexus)](https://dev.azure.com/teamkodi/binary-addons/_build/latest?definitionId=74&branchName=Nexus)
10+
[![Build Status](https://jenkins.kodi.tv/view/Addons/job/xbmc/job/audiodecoder.sacd/job/Nexus/badge/icon)](https://jenkins.kodi.tv/blue/organizations/jenkins/xbmc%2Faudiodecoder.sacd/branches/)
11+
<!--- [![Build Status](https://ci.appveyor.com/api/projects/status/github/xbmc/audiodecoder.sacd?branch=Nexus&svg=true)](https://ci.appveyor.com/project/xbmc/audiodecoder-sacd?branch=Nexus) -->
1112

1213
# audiodecoder.sacd addon for Kodi
1314

@@ -25,7 +26,7 @@ The following instructions assume you will have built Kodi already in the `kodi-
2526
suggested by the README.
2627

2728
1. `git clone --branch master https://github.com/xbmc/xbmc.git`
28-
2. `git clone --branch Matrix https://github.com/xbmc/audiodecoder.sacd.git`
29+
2. `git clone --branch Nexus https://github.com/xbmc/audiodecoder.sacd.git`
2930
3. `cd audiodecoder.sacd && mkdir build && cd build`
3031
4. `cmake -DADDONS_TO_BUILD=audiodecoder.sacd -DADDON_SRC_PREFIX=../.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../../xbmc/kodi-build/addons -DPACKAGE_ZIP=1 ../../xbmc/cmake/addons`
3132
5. `make`

audiodecoder.sacd/addon.xml.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<addon
33
id="audiodecoder.sacd"
4-
version="19.0.0"
4+
version="20.0.0"
55
name="SACD ISO support"
66
provider-name="Team Kodi, AlwinEsch">
77
<requires>@ADDON_DEPENDS@</requires>

audiodecoder.sacd/changelog.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
v20.0.0:
2+
- Increased version to 20.0.0
3+
- This addon version relates to Kodi 20 Nexus version
4+
- With start of Kodi 20 Nexus, takes addon as major the same version number as Kodi.
5+
This done to know easier to which Kodi the addon works.
6+
17
v19.0.0:
28
- Fixed fallback if selected tracks not available
39
- If user select multichannel tracks and not available it fallback now to use stereo, just as well in others, if he prefers stereo.

azure-pipelines.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ trigger:
55
branches:
66
include:
77
- Matrix
8+
- Nexus
89
- releases/*
910
paths:
1011
include:

0 commit comments

Comments
 (0)