From 69ca362bccf77f9a0a15feafaf23d9448f5496a0 Mon Sep 17 00:00:00 2001
From: MoojMidge <56883549+MoojMidge@users.noreply.github.com>
Date: Sat, 16 Mar 2024 17:44:30 +1100
Subject: [PATCH] Update workflows

- Fix make-release for Leia
- Update dependencies
---
 .github/workflows/addon-validations.yml       |  2 +-
 .github/workflows/make-release.yml            | 24 ++++++++++++-------
 .github/workflows/submit-release.yml          |  4 ++--
 .../sync-addon-metadata-translations.yml      |  6 ++---
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/addon-validations.yml b/.github/workflows/addon-validations.yml
index 04ee126e9..19ff0d110 100644
--- a/.github/workflows/addon-validations.yml
+++ b/.github/workflows/addon-validations.yml
@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: Checkout Add-on
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: ${{ github.event.repository.name }}
 
diff --git a/.github/workflows/make-release.yml b/.github/workflows/make-release.yml
index 4744db9f5..813839779 100644
--- a/.github/workflows/make-release.yml
+++ b/.github/workflows/make-release.yml
@@ -28,7 +28,7 @@ jobs:
           fi
 
       - name: Checkout Add-on
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: ${{ github.event.repository.name }}
 
@@ -57,7 +57,8 @@ jobs:
           rm *.md
           news=$(awk '/^## /{rel_num++} {if(rel_num==2){exit} if(rel_num==1){print}}' changelog.txt | sed -E 's/ ?#[[:digit:]]+[., ]?//;s/\r//')
           version=$(xmlstarlet sel -t -v 'string(/addon/@version)' addon.xml)
-          xmlstarlet ed -L -P -s '/addon/extension[@point="xbmc.addon.metadata"]' -t elem -n news -v "${news:0:1500}" \
+          xmlstarlet ed -L -P \
+            -s '/addon/extension[@point="xbmc.addon.metadata"]' -t elem -n news -v "${news:0:1500}" \
             -u '/addon/@version' -v "${version}" \
             addon.xml
           filename=${{ github.event.repository.name }}-${version}.zip
@@ -82,7 +83,8 @@ jobs:
           rm *.md
           news=$(awk '/^## /{rel_num++} {if(rel_num==2){exit} if(rel_num==1){print}}' changelog.txt | sed -E 's/ ?#[[:digit:]]+[., ]?//;s/\r//')
           version=$(xmlstarlet sel -t -v 'string(/addon/@version)' addon.xml)
-          xmlstarlet ed -L -P -s '/addon/extension[@point="xbmc.addon.metadata"]' -t elem -n news -v "${news:0:1500}" \
+          xmlstarlet ed -L -P \
+            -s '/addon/extension[@point="xbmc.addon.metadata"]' -t elem -n news -v "${news:0:1500}" \
             -u '/addon/@version' -v "${version}+unofficial.1" \
             addon.xml
           filename=${{ github.event.repository.name }}-${version}.unofficial.1.zip
@@ -103,7 +105,8 @@ jobs:
           rm *.md
           news=$(awk '/^## /{rel_num++} {if(rel_num==2){exit} if(rel_num==1){print}}' changelog.txt | sed -E 's/ ?#[[:digit:]]+[., ]?//;s/\r//')
           version=$(xmlstarlet sel -t -v 'string(/addon/@version)' addon.xml)
-          xmlstarlet ed -L -P -s '/addon/extension[@point="xbmc.addon.metadata"]' -t elem -n news -v "${news:0:1500}" \
+          xmlstarlet ed -L -P \
+            -s '/addon/extension[@point="xbmc.addon.metadata"]' -t elem -n news -v "${news:0:1500}" \
             -u '/addon/@version' -v "${version}+matrix.1" \
             -u '/addon/requires/import[@addon="xbmc.python"]/@version' -v '3.0.0' \
             -u '/addon/requires/import[@addon="inputstream.adaptive"]/@version' -v '19.0.0' \
@@ -131,7 +134,8 @@ jobs:
           rm *.md
           news=$(awk '/^## /{rel_num++} {if(rel_num==2){exit} if(rel_num==1){print}}' changelog.txt | sed -E 's/ ?#[[:digit:]]+[., ]?//;s/\r//')
           version=$(xmlstarlet sel -t -v 'string(/addon/@version)' addon.xml)
-          xmlstarlet ed -L -P -s '/addon/extension[@point="xbmc.addon.metadata"]' -t elem -n news -v "${news:0:1500}" \
+          xmlstarlet ed -L -P \
+            -s '/addon/extension[@point="xbmc.addon.metadata"]' -t elem -n news -v "${news:0:1500}" \
             -u '/addon/@version' -v "${version}+matrix.unofficial.1" \
             -u '/addon/requires/import[@addon="xbmc.python"]/@version' -v '3.0.0' \
             -u '/addon/requires/import[@addon="inputstream.adaptive"]/@version' -v '19.0.0' \
@@ -155,7 +159,8 @@ jobs:
           rm *.md
           news=$(awk '/^## /{rel_num++} {if(rel_num==2){exit} if(rel_num==1){print}}' changelog.txt | sed -E 's/ ?#[[:digit:]]+[., ]?//;s/\r//')
           version=$(xmlstarlet sel -t -v 'string(/addon/@version)' addon.xml)
-          xmlstarlet ed -L -P -s '/addon/extension[@point="xbmc.addon.metadata"]' -t elem -n news -v "${news:0:1500}" \
+          xmlstarlet ed -L -P \
+            -s '/addon/extension[@point="xbmc.addon.metadata"]' -t elem -n news -v "${news:0:1500}" \
             -u '/addon/@version' -v "${version}+leia.1" \
             -u '/addon/requires/import[@addon="xbmc.python"]/@version' -v '2.26.0' \
             -d '/addon/requires/import[@addon="script.module.requests"]/@version' \
@@ -164,7 +169,7 @@ jobs:
             -d '/addon/requires/import[@addon="script.module.infotagger"]' \
             -s '/addon/requires' -t elem -n import_temp \
             -s '/addon/requires/import_temp' -t attr -n addon -v 'script.module.kodi-six' \
-            -s '/addon/requires/import_temp' -v import \
+            -r '/addon/requires/import_temp' -v import \
             addon.xml
           filename=${{ github.event.repository.name }}-${version}.leia.1.zip
           cd ..
@@ -188,7 +193,8 @@ jobs:
           rm *.md
           news=$(awk '/^## /{rel_num++} {if(rel_num==2){exit} if(rel_num==1){print}}' changelog.txt | sed -E 's/ ?#[[:digit:]]+[., ]?//;s/\r//')
           version=$(xmlstarlet sel -t -v 'string(/addon/@version)' addon.xml)
-          xmlstarlet ed -L -P -s '/addon/extension[@point="xbmc.addon.metadata"]' -t elem -n news -v "${news:0:1500}" \
+          xmlstarlet ed -L -P \
+            -s '/addon/extension[@point="xbmc.addon.metadata"]' -t elem -n news -v "${news:0:1500}" \
             -u '/addon/@version' -v "${version}+leia.unofficial.1" \
             -u '/addon/requires/import[@addon="xbmc.python"]/@version' -v '2.26.0' \
             -d '/addon/requires/import[@addon="script.module.requests"]/@version' \
@@ -197,7 +203,7 @@ jobs:
             -d '/addon/requires/import[@addon="script.module.infotagger"]' \
             -s '/addon/requires' -t elem -n import_temp \
             -s '/addon/requires/import_temp' -t attr -n addon -v 'script.module.kodi-six' \
-            -s '/addon/requires/import_temp' -v import \
+            -r '/addon/requires/import_temp' -v import \
             addon.xml
           filename=${{ github.event.repository.name }}-${version}.leia.unofficial.1.zip
           cd ..
diff --git a/.github/workflows/submit-release.yml b/.github/workflows/submit-release.yml
index ea284f8ad..df66d6467 100644
--- a/.github/workflows/submit-release.yml
+++ b/.github/workflows/submit-release.yml
@@ -21,12 +21,12 @@ jobs:
 
     steps:
       - name: Checkout Add-on
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: ${{ github.event.repository.name }}
 
       - 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/.github/workflows/sync-addon-metadata-translations.yml b/.github/workflows/sync-addon-metadata-translations.yml
index 078300254..8ce360ed1 100644
--- a/.github/workflows/sync-addon-metadata-translations.yml
+++ b/.github/workflows/sync-addon-metadata-translations.yml
@@ -22,18 +22,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 }}