Merge pull request xbmc#110 from phunkyfish/github-actions-v4

Update deprecated GitHub workflows
phunkyfish · Feb 19, 2024 · 7f86881 · 7f86881
2 parents 44acd30 + ba80749
commit 7f86881
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 18 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -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:
@@ -31,13 +24,13 @@ jobs:
         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
+      uses: actions/checkout@v4
       with:
         repository: xbmc/xbmc
         ref: master
         path: xbmc
-    - name: Checkout vfs.libarchive repo
-      uses: actions/checkout@v2
+    - name: Checkout add-on repo
+      uses: actions/checkout@v4
       with:
         path: ${{ env.app_id }}
     - name: Configure

diff --git a/.github/workflows/sync-addon-metadata-translations.yml b/.github/workflows/sync-addon-metadata-translations.yml
@@ -2,7 +2,7 @@ name: Sync addon metadata translations
 
 on:
   push:
-    branches: [ Matrix, Nexus ]
+    branches: [ Matrix, Nexus, Omega ]
     paths:
       - '**addon.xml.in'
       - '**resource.language.**strings.po'
@@ -21,18 +21,18 @@ jobs:
     steps:
 
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           path: project
 
       - name: Checkout sync_addon_metadata_translations repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           repository: xbmc/sync_addon_metadata_translations
           path: sync_addon_metadata_translations
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -4,8 +4,8 @@ variables:
 trigger:
   branches:
     include:
-    - Matrix
     - Nexus
+    - Omega
     - releases/*
   paths:
     include:
@@ -29,16 +29,26 @@ jobs:
           GENERATOR: "Visual Studio 17 2022"
           ARCHITECTURE: x64
           CONFIGURATION: Release
+        Win32-UWP:
+          GENERATOR: "Visual Studio 17 2022"
+          ARCHITECTURE: Win32
+          CONFIGURATION: Release
+          WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0"
         Win64-UWP:
           GENERATOR: "Visual Studio 17 2022"
           ARCHITECTURE: x64
           CONFIGURATION: Release
           WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0"
-        ARM64-UWP:
+        ARM32-UWP:
           GENERATOR: "Visual Studio 17 2022"
-          ARCHITECTURE: ARM64
+          ARCHITECTURE: ARM
           CONFIGURATION: Release
           WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0"
+        #ARM64-UWP:
+        #  GENERATOR: "Visual Studio 17 2022"
+        #  ARCHITECTURE: ARM64
+        #  CONFIGURATION: Release
+        #  WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0"
 
     workspace:
       clean: all