Skip to content

Commit

Permalink
Merge pull request #29 from AlwinEsch/Matrix-change
Browse files Browse the repository at this point in the history
[Matrix/Nexus] copyright year increase and cleanup
  • Loading branch information
AlwinEsch authored Sep 20, 2021
2 parents e893486 + 15e55d3 commit 8e3e099
Show file tree
Hide file tree
Showing 18 changed files with 183 additions and 14 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: screensaver.asteroids

jobs:
build:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
include:
- name: "Debian package test"
os: ubuntu-18.04
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:
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 screensaver.asteroids 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
58 changes: 58 additions & 0 deletions .github/workflows/sync-addon-metadata-translations.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
name: Sync addon metadata translations

on:
push:
branches: [ Matrix, Nexus ]
paths:
- '**addon.xml.in'
- '**resource.language.**strings.po'

jobs:
default:
if: github.repository == 'xbmc/screensaver.asteroids'
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 --multiple-addons
working-directory: ./project

- name: Create PR for sync-addon-metadata-translations changes
uses: peter-evans/[email protected]
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
reviewers: gade01
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
This is a [Kodi](https://kodi.tv) screensaver addon.

[![License: GPL-2.0-or-later](https://img.shields.io/badge/License-GPL%20v2+-blue.svg)](LICENSE.md)
[![Build Status](https://travis-ci.org/xbmc/screensaver.asteroids.svg?branch=Matrix)](https://travis-ci.org/xbmc/screensaver.asteroids/branches)
[![Build and run tests](https://github.com/xbmc/screensaver.asteroids/actions/workflows/build.yml/badge.svg?branch=Matrix)](https://github.com/xbmc/screensaver.asteroids/actions/workflows/build.yml)
[![Build Status](https://dev.azure.com/teamkodi/binary-addons/_apis/build/status/xbmc.screensaver.asteroids?branchName=Matrix)](https://dev.azure.com/teamkodi/binary-addons/_build/latest?definitionId=40&branchName=Matrix)
[![Build Status](https://jenkins.kodi.tv/view/Addons/job/xbmc/job/screensaver.asteroids/job/Matrix/badge/icon)](https://jenkins.kodi.tv/blue/organizations/jenkins/xbmc%2Fscreensaver.asteroids/branches/)
<!--- [![Build Status](https://ci.appveyor.com/api/projects/status/github/xbmc/screensaver.asteroids?branch=Matrix&svg=true)](https://ci.appveyor.com/project/xbmc/screensaver-asteroids?branch=Matrix) -->
Expand Down
2 changes: 1 addition & 1 deletion debian/copyright
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Upstream-Name: screensaver.asteroids
Source: https://github.com/xbmc/screensaver.asteroids

Files: *
Copyright: 2005-2020 Team Kodi
Copyright: 2005-2021 Team Kodi
2013 Arne Morten Kvarving <[email protected]>
2013 wsnipex <[email protected]>
License: GPL-2+
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Kodi Media Center language file
# Addon Name: Asteroids
# Addon id: screensaver.asteroids
# Addon Provider: Team Kodi
msgid ""
msgstr ""
"Project-Id-Version: KODI Main\n"
"Report-Msgid-Bugs-To: https://github.com/xbmc/screensaver.asteroids/issues\n"
"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Kodi Translation Team\n"
"Language-Team: German (Germany) (https://kodi.weblate.cloud/projects/kodi-add-ons-look-and-feel/screensaver-asteroids/de_de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: de_DE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

msgctxt "Addon Summary"
msgid "Asteroids screensaver"
msgstr "Asteroiden Bildschirmschoner"

msgctxt "Addon Description"
msgid "An old-style screen saver where the asteroids are shot away."
msgstr "Ein Bildschirmschoner im alten Stil, welcher die Asteroiden davon schießt."
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Kodi Media Center language file
# Addon Name: Asteroids
# Addon id: screensaver.asteroids
# Addon Provider: Team Kodi
msgid ""
msgstr ""
"Project-Id-Version: KODI Main\n"
"Report-Msgid-Bugs-To: https://github.com/xbmc/screensaver.asteroids/issues\n"
"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Kodi Translation Team\n"
"Language-Team: English (United Kingdom) (https://kodi.weblate.cloud/projects/kodi-add-ons-look-and-feel/screensaver-asteroids/en_gb/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: en_GB\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

msgctxt "Addon Summary"
msgid "Asteroids screensaver"
msgstr ""

msgctxt "Addon Description"
msgid "An old-style screen saver where the asteroids are shot away."
msgstr ""
2 changes: 1 addition & 1 deletion src/Asteroids.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2020 Team Kodi (https://kodi.tv)
* Copyright (C) 2005-2021 Team Kodi (https://kodi.tv)
* Copyright (C) 2005 Joakim Eriksson <[email protected]>
*
* SPDX-License-Identifier: GPL-2.0-or-later
Expand Down
2 changes: 1 addition & 1 deletion src/Asteroids.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2020 Team Kodi (https://kodi.tv)
* Copyright (C) 2005-2021 Team Kodi (https://kodi.tv)
* Copyright (C) 2005 Joakim Eriksson <[email protected]>
*
* SPDX-License-Identifier: GPL-2.0-or-later
Expand Down
2 changes: 1 addition & 1 deletion src/asteroid.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2020 Team Kodi (https://kodi.tv)
* Copyright (C) 2005-2021 Team Kodi (https://kodi.tv)
* Copyright (C) 2005 Joakim Eriksson <[email protected]>
*
* SPDX-License-Identifier: GPL-2.0-or-later
Expand Down
2 changes: 1 addition & 1 deletion src/asteroid.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2020 Team Kodi (https://kodi.tv)
* Copyright (C) 2005-2021 Team Kodi (https://kodi.tv)
* Copyright (C) 2005 Joakim Eriksson <[email protected]>
*
* SPDX-License-Identifier: GPL-2.0-or-later
Expand Down
2 changes: 1 addition & 1 deletion src/bullet.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2020 Team Kodi (https://kodi.tv)
* Copyright (C) 2005-2021 Team Kodi (https://kodi.tv)
* Copyright (C) 2005 Joakim Eriksson <[email protected]>
*
* SPDX-License-Identifier: GPL-2.0-or-later
Expand Down
2 changes: 1 addition & 1 deletion src/bullet.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2020 Team Kodi (https://kodi.tv)
* Copyright (C) 2005-2021 Team Kodi (https://kodi.tv)
* Copyright (C) 2005 Joakim Eriksson <[email protected]>
*
* SPDX-License-Identifier: GPL-2.0-or-later
Expand Down
2 changes: 1 addition & 1 deletion src/main.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2020 Team Kodi (https://kodi.tv)
* Copyright (C) 2005-2021 Team Kodi (https://kodi.tv)
* Copyright (C) 2005 Joakim Eriksson <[email protected]>
*
* SPDX-License-Identifier: GPL-2.0-or-later
Expand Down
2 changes: 1 addition & 1 deletion src/main.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2020 Team Kodi (https://kodi.tv)
* Copyright (C) 2005-2021 Team Kodi (https://kodi.tv)
* Copyright (C) 2005 Joakim Eriksson <[email protected]>
*
* SPDX-License-Identifier: GPL-2.0-or-later
Expand Down
2 changes: 1 addition & 1 deletion src/ship.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2020 Team Kodi (https://kodi.tv)
* Copyright (C) 2005-2021 Team Kodi (https://kodi.tv)
* Copyright (C) 2005 Joakim Eriksson <[email protected]>
*
* SPDX-License-Identifier: GPL-2.0-or-later
Expand Down
2 changes: 1 addition & 1 deletion src/ship.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2020 Team Kodi (https://kodi.tv)
* Copyright (C) 2005-2021 Team Kodi (https://kodi.tv)
* Copyright (C) 2005 Joakim Eriksson <[email protected]>
*
* SPDX-License-Identifier: GPL-2.0-or-later
Expand Down
2 changes: 1 addition & 1 deletion src/timer.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2020 Team Kodi (https://kodi.tv)
* Copyright (C) 2005-2021 Team Kodi (https://kodi.tv)
* Copyright (C) 2005 Joakim Eriksson <[email protected]>
*
* SPDX-License-Identifier: GPL-2.0-or-later
Expand Down
2 changes: 1 addition & 1 deletion src/types.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2020 Team Kodi (https://kodi.tv)
* Copyright (C) 2005-2021 Team Kodi (https://kodi.tv)
* Copyright (C) 2005 Joakim Eriksson <[email protected]>
*
* SPDX-License-Identifier: GPL-2.0-or-later
Expand Down

0 comments on commit 8e3e099

Please sign in to comment.