Skip to content

Commit 82c8dad

Browse files
committed
Merge pull request #54 from phunkyfish/github-actions-v4
Update deprecated GitHub workflows
2 parents 499a14d + 6d651c7 commit 82c8dad

File tree

3 files changed

+89
-14
lines changed

3 files changed

+89
-14
lines changed

.github/workflows/build.yml

+54
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
name: Build and run tests
2+
on: [push, pull_request]
3+
env:
4+
app_id: visualization.starburst
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-latest
15+
CC: gcc
16+
CXX: g++
17+
DEBIAN_BUILD: true
18+
steps:
19+
- name: Install needed ubuntu depends
20+
env:
21+
DEBIAN_BUILD: ${{ matrix.DEBIAN_BUILD }}
22+
run: |
23+
if [[ $DEBIAN_BUILD == true ]]; then sudo add-apt-repository -y ppa:team-xbmc/xbmc-nightly; fi
24+
if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get update; fi
25+
if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get install fakeroot; fi
26+
- name: Checkout Kodi repo
27+
uses: actions/checkout@v4
28+
with:
29+
repository: xbmc/xbmc
30+
ref: master
31+
path: xbmc
32+
- name: Checkout add-on repo
33+
uses: actions/checkout@v4
34+
with:
35+
path: ${{ env.app_id }}
36+
- name: Configure
37+
env:
38+
CC: ${{ matrix.CC }}
39+
CXX: ${{ matrix.CXX }}
40+
DEBIAN_BUILD: ${{ matrix.DEBIAN_BUILD }}
41+
run: |
42+
if [[ $DEBIAN_BUILD != true ]]; then cd ${app_id} && mkdir -p build && cd build; fi
43+
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
44+
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
45+
if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get build-dep ${{ github.workspace }}/${app_id}; fi
46+
- name: Build
47+
env:
48+
CC: ${{ matrix.CC }}
49+
CXX: ${{ matrix.CXX }}
50+
DEBIAN_BUILD: ${{ matrix.DEBIAN_BUILD }}
51+
run: |
52+
if [[ $DEBIAN_BUILD != true ]]; then cd ${app_id}/build; fi
53+
if [[ $DEBIAN_BUILD != true ]]; then make; fi
54+
if [[ $DEBIAN_BUILD == true ]]; then ./debian-addon-package-test.sh ${{ github.workspace }}/${app_id}; fi

.github/workflows/sync-addon-metadata-translations.yml

+19-7
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,44 @@ name: Sync addon metadata translations
22

33
on:
44
push:
5-
branches: [ Matrix, Nexus ]
5+
branches: [ Matrix, Nexus, Omega ]
66
paths:
7-
- '**addon.xml'
7+
- '**addon.xml.in'
88
- '**resource.language.**strings.po'
99

1010
jobs:
1111
default:
1212
if: github.repository == 'xbmc/visualization.starburst'
1313
runs-on: ubuntu-latest
1414

15+
strategy:
16+
17+
fail-fast: false
18+
matrix:
19+
python-version: [ 3.9 ]
20+
1521
steps:
1622

1723
- name: Checkout repository
18-
uses: actions/checkout@v2
24+
uses: actions/checkout@v4
1925
with:
2026
path: project
2127

22-
- name: Set up Python
23-
uses: actions/setup-python@v2
28+
- name: Checkout sync_addon_metadata_translations repository
29+
uses: actions/checkout@v4
30+
with:
31+
repository: xbmc/sync_addon_metadata_translations
32+
path: sync_addon_metadata_translations
33+
34+
- name: Set up Python ${{ matrix.python-version }}
35+
uses: actions/setup-python@v5
2436
with:
25-
python-version: '3.9'
37+
python-version: ${{ matrix.python-version }}
2638

2739
- name: Install dependencies
2840
run: |
2941
python -m pip install --upgrade pip
30-
python -m pip install git+https://github.com/xbmc/sync_addon_metadata_translations.git
42+
python -m pip install sync_addon_metadata_translations/
3143
3244
- name: Run sync-addon-metadata-translations
3345
run: |

azure-pipelines.yml

+16-7
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ trigger:
55
branches:
66
include:
77
- Nexus
8+
- Omega
89
- releases/*
910
paths:
1011
include:
@@ -24,22 +25,30 @@ jobs:
2425
GENERATOR: "Visual Studio 17 2022"
2526
ARCHITECTURE: Win32
2627
CONFIGURATION: Release
27-
CMAKE_DEFINES: -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_SYSTEM_VERSION="10.0.17763.0"
2828
Win64:
2929
GENERATOR: "Visual Studio 17 2022"
3030
ARCHITECTURE: x64
3131
CONFIGURATION: Release
32-
CMAKE_DEFINES: -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_SYSTEM_VERSION="10.0.17763.0"
32+
Win32-UWP:
33+
GENERATOR: "Visual Studio 17 2022"
34+
ARCHITECTURE: Win32
35+
CONFIGURATION: Release
36+
WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0"
3337
Win64-UWP:
3438
GENERATOR: "Visual Studio 17 2022"
3539
ARCHITECTURE: x64
3640
CONFIGURATION: Release
37-
CMAKE_DEFINES: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0"
38-
ARM64-UWP:
41+
WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0"
42+
ARM32-UWP:
3943
GENERATOR: "Visual Studio 17 2022"
40-
ARCHITECTURE: ARM64
44+
ARCHITECTURE: ARM
4145
CONFIGURATION: Release
42-
CMAKE_DEFINES: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0"
46+
WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0"
47+
#ARM64-UWP:
48+
# GENERATOR: "Visual Studio 17 2022"
49+
# ARCHITECTURE: ARM64
50+
# CONFIGURATION: Release
51+
# WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0"
4352

4453
workspace:
4554
clean: all
@@ -59,7 +68,7 @@ jobs:
5968
- task: CMake@1
6069
inputs:
6170
workingDirectory: 'build'
62-
cmakeArgs: '-T host=x64 -G "$(GENERATOR)" -A $(ARCHITECTURE) $(CMAKE_DEFINES) -DADDONS_TO_BUILD=$(app_id) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DADDONS_DEFINITION_DIR=$(Pipeline.Workspace)/$(app_id)/build/definition -DADDON_SRC_PREFIX=../.. -DCMAKE_INSTALL_PREFIX=../../kodi/addons -DPACKAGE_ZIP=1 ../../kodi/cmake/addons'
71+
cmakeArgs: '-T host=x64 -G "$(GENERATOR)" -A $(ARCHITECTURE) $(WINSTORE) -DADDONS_TO_BUILD=$(app_id) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DADDONS_DEFINITION_DIR=$(Pipeline.Workspace)/$(app_id)/build/definition -DADDON_SRC_PREFIX=../.. -DCMAKE_INSTALL_PREFIX=../../kodi/addons -DPACKAGE_ZIP=1 ../../kodi/cmake/addons'
6372

6473
- task: CMake@1
6574
inputs:

0 commit comments

Comments
 (0)