Merge pull request anxdpanic#551 from MoojMidge/wip-unstable

Restore related videos, recommendations, and auto-play next functionality
MoojMidge · Jan 15, 2024 · 6f33351 · 6f33351
2 parents e69fa0c + 1f4c5ac
commit 6f33351
Show file tree

Hide file tree

Showing 65 changed files with 2,561 additions and 2,601 deletions.
diff --git a/.github/workflows/make-release.yml b/.github/workflows/make-release.yml
@@ -20,7 +20,7 @@ jobs:
         id: release
         run: |
           version=${GITHUB_REF/refs\/tags\//}
-          if [[ $version == *-dev ]] ;
+          if [[ $version == *[-+]@(alpha|beta|dev)*([.0-9a-z]) ]] ;
           then
             echo "pre-release=true" >> $GITHUB_OUTPUT
           else
@@ -64,11 +64,14 @@ jobs:
 
       - name: Create Zip (Nexus-Unofficial)
         id: zip-unofficial-nexus
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           git reset
           git checkout .
+          git fetch origin nexus-unofficial
+          git cherry-pick ...origin/nexus-unofficial -n
           git clean -fdx
-          git apply .patches/unofficial.patch
           mv .git ..
           rm -rf .??*
           rm *.md
@@ -104,11 +107,14 @@ jobs:
 
       - name: Create Zip (Matrix-Unofficial)
         id: zip-unofficial-matrix
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           git reset
           git checkout .
+          git fetch origin nexus-unofficial
+          git cherry-pick ...origin/nexus-unofficial -n
           git clean -fdx
-          git apply .patches/unofficial.patch
           mv .git ..
           rm -rf .??*
           rm *.md

diff --git a/.github/workflows/submit-release.yml b/.github/workflows/submit-release.yml
@@ -74,7 +74,7 @@ jobs:
           version=$(xmlstarlet sel -t -v 'string(/addon/@version)' addon.xml)
           xmlstarlet ed -L -u '/addon/@version' -v "${version}+matrix.1" addon.xml
           xmlstarlet ed -L -u '/addon/requires/import[@addon="xbmc.python"]/@version' -v '3.0.0' addon.xml
-          xmlstarlet ed -L -u '/addon/requires/import[@addon="inputstream.adaptive"]/@version' -v '19.0.7' addon.xml
+          xmlstarlet ed -L -u '/addon/requires/import[@addon="inputstream.adaptive"]/@version' -v '19.0.0' addon.xml
           xmlstarlet ed -L -d '/addon/requires/import[@addon="script.module.infotagger"]' addon.xml
           git add .
           git commit -m "Kodi 19 Patch"