mirror of
https://github.com/DigitalDevices/pvr.octonet.git
synced 2025-03-01 10:53:09 +00:00
Merge pull request #61 from ksooo/ci-fixes-nexus
[Nexus] CI fixes/updates
This commit is contained in:
Kai Sommerfeld
GitHub
commit
656912b9f1
11
.github/workflows/build.yml
vendored
11
.github/workflows/build.yml
vendored
@ -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:
|
||||
@ -34,7 +27,7 @@ jobs:
|
||||
uses: actions/checkout@v2
|
||||
with:
|
||||
repository: xbmc/xbmc
|
||||
ref: master
|
||||
ref: Nexus
|
||||
path: xbmc
|
||||
- name: Checkout pvr.argustv repo
|
||||
uses: actions/checkout@v2
|
||||
|
||||
62
.github/workflows/increment-version.yml
vendored
62
.github/workflows/increment-version.yml
vendored
@ -1,62 +0,0 @@
|
||||
name: Increment version when languages are updated
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ Matrix, Nexus ]
|
||||
paths:
|
||||
- '**resource.language.**strings.po'
|
||||
|
||||
jobs:
|
||||
default:
|
||||
if: github.repository == 'DigitalDevices/pvr.octonet'
|
||||
runs-on: ubuntu-latest
|
||||
name: Increment add-on version when languages are updated
|
||||
|
||||
steps:
|
||||
|
||||
- name: Checkout Repository
|
||||
uses: actions/checkout@v2
|
||||
with:
|
||||
fetch-depth: 0
|
||||
path: ${{ github.event.repository.name }}
|
||||
|
||||
- name: Checkout Scripts
|
||||
uses: actions/checkout@v2
|
||||
with:
|
||||
fetch-depth: 0
|
||||
repository: xbmc/weblate-supplementary-scripts
|
||||
path: scripts
|
||||
|
||||
- name: Set up Python
|
||||
uses: actions/setup-python@v2
|
||||
with:
|
||||
python-version: '3.9'
|
||||
|
||||
- name: Get changed files
|
||||
uses: trilom/file-changes-action@v1.2.4
|
||||
|
||||
- name: Increment add-on version
|
||||
run: |
|
||||
python3 ../scripts/binary/increment_version.py $HOME/files.json -c -n
|
||||
working-directory: ${{ github.event.repository.name }}
|
||||
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
sudo apt-get install libxml2-utils xmlstarlet
|
||||
|
||||
- name: Get required variables
|
||||
id: required-variables
|
||||
run: |
|
||||
version=$(xmlstarlet fo -R "$(find . -name addon.xml.in)" | xmlstarlet sel -t -v 'string(/addon/@version)')
|
||||
echo ::set-output name=version::$version
|
||||
working-directory: ${{ github.event.repository.name }}
|
||||
|
||||
- name: Create PR for incrementing add-on versions
|
||||
uses: peter-evans/create-pull-request@v3.10.0
|
||||
with:
|
||||
commit-message: Add-on version incremented to ${{ steps.required-variables.outputs.version }} from Weblate
|
||||
title: Add-on version incremented to ${{ steps.required-variables.outputs.version }} from Weblate
|
||||
body: Add-on version incremented triggered by ${{ github.sha }}
|
||||
branch: inc-ver
|
||||
delete-branch: true
|
||||
path: ./${{ github.event.repository.name }}
|
||||
@ -1,57 +0,0 @@
|
||||
name: Sync addon metadata translations
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ Matrix, Nexus ]
|
||||
paths:
|
||||
- '**addon.xml.in'
|
||||
- '**resource.language.**strings.po'
|
||||
|
||||
jobs:
|
||||
default:
|
||||
if: github.repository == 'DigitalDevices/pvr.octonet'
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
strategy:
|
||||
|
||||
fail-fast: false
|
||||
matrix:
|
||||
python-version: [ 3.9 ]
|
||||
|
||||
steps:
|
||||
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v2
|
||||
with:
|
||||
path: project
|
||||
|
||||
- name: Checkout sync_addon_metadata_translations repository
|
||||
uses: actions/checkout@v2
|
||||
with:
|
||||
repository: xbmc/sync_addon_metadata_translations
|
||||
path: sync_addon_metadata_translations
|
||||
|
||||
- name: Set up Python ${{ matrix.python-version }}
|
||||
uses: actions/setup-python@v2
|
||||
with:
|
||||
python-version: ${{ matrix.python-version }}
|
||||
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
python -m pip install --upgrade pip
|
||||
python -m pip install sync_addon_metadata_translations/
|
||||
|
||||
- name: Run sync-addon-metadata-translations
|
||||
run: |
|
||||
sync-addon-metadata-translations
|
||||
working-directory: ./project
|
||||
|
||||
- name: Create PR for sync-addon-metadata-translations changes
|
||||
uses: peter-evans/create-pull-request@v3.10.0
|
||||
with:
|
||||
commit-message: Sync of addon metadata translations
|
||||
title: Sync of addon metadata translations
|
||||
body: Sync of addon metadata translations triggered by ${{ github.sha }}
|
||||
branch: amt-sync
|
||||
delete-branch: true
|
||||
path: ./project
|
||||
54
.travis.yml
54
.travis.yml
@ -1,54 +0,0 @@
|
||||
language: cpp
|
||||
|
||||
#
|
||||
# Define the builds to get up to date versions of cmake and gcc
|
||||
#
|
||||
env:
|
||||
global:
|
||||
- app_id=pvr.octonet
|
||||
|
||||
matrix:
|
||||
include:
|
||||
- os: linux
|
||||
dist: bionic
|
||||
sudo: required
|
||||
compiler: gcc
|
||||
- os: linux
|
||||
dist: bionic
|
||||
sudo: required
|
||||
compiler: clang
|
||||
- os: linux
|
||||
dist: bionic
|
||||
sudo: required
|
||||
compiler: gcc
|
||||
env: DEBIAN_BUILD=true
|
||||
- os: linux
|
||||
dist: focal
|
||||
sudo: required
|
||||
compiler: gcc
|
||||
env: DEBIAN_BUILD=true
|
||||
- os: osx
|
||||
osx_image: xcode10.2
|
||||
|
||||
before_install:
|
||||
- if [[ $DEBIAN_BUILD == true ]]; then sudo add-apt-repository -y ppa:team-xbmc/xbmc-nightly; fi
|
||||
- if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get update; fi
|
||||
- if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get install fakeroot; fi
|
||||
|
||||
#
|
||||
# The addon source is automatically checked out in $TRAVIS_BUILD_DIR,
|
||||
# we'll put the Kodi source on the same level
|
||||
#
|
||||
before_script:
|
||||
- if [[ $DEBIAN_BUILD != true ]]; then cd $TRAVIS_BUILD_DIR/..; fi
|
||||
- if [[ $DEBIAN_BUILD != true ]]; then git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git; fi
|
||||
- if [[ $DEBIAN_BUILD != true ]]; then cd ${app_id} && mkdir build && cd build; fi
|
||||
- if [[ $DEBIAN_BUILD != true ]]; then mkdir -p definition/${app_id}; fi
|
||||
- if [[ $DEBIAN_BUILD != true ]]; then echo ${app_id} $TRAVIS_BUILD_DIR $TRAVIS_COMMIT > definition/${app_id}/${app_id}.txt; fi
|
||||
- if [[ $DEBIAN_BUILD != true ]]; then cmake -DADDONS_TO_BUILD=${app_id} -DADDON_SRC_PREFIX=$TRAVIS_BUILD_DIR/.. -DADDONS_DEFINITION_DIR=$TRAVIS_BUILD_DIR/build/definition -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/../xbmc/addons -DPACKAGE_ZIP=1 $TRAVIS_BUILD_DIR/../xbmc/cmake/addons; fi
|
||||
- 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
|
||||
- if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get build-dep $TRAVIS_BUILD_DIR; fi
|
||||
|
||||
script:
|
||||
- if [[ $DEBIAN_BUILD != true ]]; then make; fi
|
||||
- if [[ $DEBIAN_BUILD == true ]]; then ./debian-addon-package-test.sh $TRAVIS_BUILD_DIR; fi
|
||||
@ -1,10 +1,9 @@
|
||||
# Octonet PVR
|
||||
Digital Devices [Octonet](http://www.digital-devices.eu/shop/de/netzwerk-tv/) PVR client addon for [Kodi](http://kodi.tv)
|
||||
|
||||
| Platform | Status |
|
||||
|----------|--------|
|
||||
| Linux + OS X (github) | [](https://github.com/kodi-pvr/pvr.octonet/actions/workflows/build.yml) |
|
||||
| Windows (AppVeyor) | [](https://ci.appveyor.com/project/julianscheel/pvr-octonet) |
|
||||
[](LICENSE.md)
|
||||
[](https://github.com/DigitalDevices/pvr.octonet/actions/workflows/build.yml)
|
||||
[](https://jenkins.kodi.tv/blue/organizations/jenkins/DigitalDevices%2Fpvr.octonet/branches/)
|
||||
|
||||
# Building
|
||||
|
||||
|
||||
33
appveyor.yml
33
appveyor.yml
@ -1,33 +0,0 @@
|
||||
version: BuildNr.{build}
|
||||
|
||||
image: Visual Studio 2017
|
||||
|
||||
shallow_clone: true
|
||||
|
||||
clone_folder: c:\projects\pvr.octonet
|
||||
|
||||
environment:
|
||||
app_id: pvr.octonet
|
||||
|
||||
matrix:
|
||||
- GENERATOR: "Visual Studio 15"
|
||||
CONFIG: Release
|
||||
- GENERATOR: "Visual Studio 15 Win64"
|
||||
CONFIG: Release
|
||||
- GENERATOR: "Visual Studio 15 Win64"
|
||||
CONFIG: Release
|
||||
WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0"
|
||||
- GENERATOR: "Visual Studio 15 ARM"
|
||||
CONFIG: Release
|
||||
WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0"
|
||||
|
||||
build_script:
|
||||
- cd ..
|
||||
- git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git
|
||||
- cd %app_id%
|
||||
- mkdir build
|
||||
- cd build
|
||||
- mkdir -p definition\%app_id%
|
||||
- echo %app_id% %APPVEYOR_BUILD_FOLDER% %APPVEYOR_REPO_COMMIT% > definition\%app_id%\%app_id%.txt
|
||||
- cmake -T host=x64 -G "%GENERATOR%" %WINSTORE% -DADDONS_TO_BUILD=%app_id% -DCMAKE_BUILD_TYPE=%CONFIG% -DADDONS_DEFINITION_DIR=%APPVEYOR_BUILD_FOLDER%/build/definition -DADDON_SRC_PREFIX=../.. -DCMAKE_INSTALL_PREFIX=../../xbmc/addons -DPACKAGE_ZIP=1 ../../xbmc/cmake/addons
|
||||
- cmake --build . --config %CONFIG% --target %app_id%
|
||||
Loading…
x
Reference in New Issue
Block a user