Skip to content

Commit

Permalink
Merge pull request #78 from AlwinEsch/Nexus-changes
Browse files Browse the repository at this point in the history
[Nexus] Sync translations, workflow cleanup and use only Nexus for translations from now
  • Loading branch information
AlwinEsch authored Sep 17, 2022
2 parents 9f74404 + 06daece commit b4060ba
Show file tree
Hide file tree
Showing 19 changed files with 234 additions and 254 deletions.
61 changes: 61 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
name: Build and run tests
on: [push, pull_request]
env:
app_id: visualization.waveform

jobs:
build:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
include:
- name: "Debian package test"
os: ubuntu-20.04
CC: gcc
CXX: g++
DEBIAN_BUILD: true
#- os: ubuntu-20.04
#CC: gcc
#CXX: g++
#- os: ubuntu-20.04
#CC: clang
#CXX: clang++
#- os: macos-11
steps:
- name: Install needed ubuntu depends
env:
DEBIAN_BUILD: ${{ matrix.DEBIAN_BUILD }}
run: |
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
- name: Checkout Kodi repo
uses: actions/checkout@v2
with:
repository: xbmc/xbmc
ref: master
path: xbmc
- name: Checkout visualization.waveform repo
uses: actions/checkout@v2
with:
path: ${{ env.app_id }}
- name: Configure
env:
CC: ${{ matrix.CC }}
CXX: ${{ matrix.CXX }}
DEBIAN_BUILD: ${{ matrix.DEBIAN_BUILD }}
run: |
if [[ $DEBIAN_BUILD != true ]]; then cd ${app_id} && mkdir -p build && cd build; fi
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
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 ${{ github.workspace }}/${app_id}; fi
- name: Build
env:
CC: ${{ matrix.CC }}
CXX: ${{ matrix.CXX }}
DEBIAN_BUILD: ${{ matrix.DEBIAN_BUILD }}
run: |
if [[ $DEBIAN_BUILD != true ]]; then cd ${app_id}/build; fi
if [[ $DEBIAN_BUILD != true ]]; then make; fi
if [[ $DEBIAN_BUILD == true ]]; then ./debian-addon-package-test.sh ${{ github.workspace }}/${app_id}; fi
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: [ Nexus ]
paths:
- '**addon.xml.in'
- '**resource.language.**strings.po'
Expand Down
54 changes: 0 additions & 54 deletions .travis.yml

This file was deleted.

1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ This is a [Kodi](http://kodi.tv) visualization addon.
[![License: GPL-2.0-or-later](https://img.shields.io/badge/License-GPL%20v2+-blue.svg)](LICENSE.md)
[![Build Status](https://dev.azure.com/teamkodi/binary-addons/_apis/build/status/xbmc.visualization.waveform?branchName=Nexus)](https://dev.azure.com/teamkodi/binary-addons/_build/latest?definitionId=31&branchName=Nexus)
[![Build Status](https://jenkins.kodi.tv/view/Addons/job/xbmc/job/visualization.waveform/job/Nexus/badge/icon)](https://jenkins.kodi.tv/blue/organizations/jenkins/xbmc%2Fvisualization.waveform/branches/)
<!--- [![Build Status](https://ci.appveyor.com/api/projects/status/github/xbmc/visualization.waveform?branch=Nexus&svg=true)](https://ci.appveyor.com/project/xbmc/visualization-waveform?branch=Nexus) -->

![screenshot](https://raw.githubusercontent.com/xbmc/visualization.waveform/master/visualization.waveform/resources/screenshot-02.jpg)

Expand Down
33 changes: 0 additions & 33 deletions appveyor.yml

This file was deleted.

4 changes: 2 additions & 2 deletions debian/copyright
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Format: http://dep.debian.net/deps/dep5
Upstream-Name: visualization.waveform

Files: *
Copyright: 2005-2021 Team Kodi
Copyright: 2005-2022 Team Kodi
License: GPL-2+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand All @@ -24,7 +24,7 @@ License: GPL-2+
Files: debian/*
Copyright: 2013 Arne Morten Kvarving <[email protected]>
2013 wsnipex <[email protected]>
2005-2021 Team Kodi
2005-2022 Team Kodi
License: GPL-2+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion src/Main_dx.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2021 Team Kodi (https://kodi.tv)
* Copyright (C) 2008-2022 Team Kodi (https://kodi.tv)
*
* SPDX-License-Identifier: GPL-2.0-or-later
* See LICENSE.md for more information.
Expand Down
2 changes: 1 addition & 1 deletion src/Main_gl.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (C) 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson and 4Front Technologies
* Copyright (C) 2008-2021 Team Kodi (https://kodi.tv)
* Copyright (C) 2008-2022 Team Kodi (https://kodi.tv)
*
* SPDX-License-Identifier: GPL-2.0-or-later
* See LICENSE.md for more information.
Expand Down
Loading

0 comments on commit b4060ba

Please sign in to comment.