Update workflows

- Remove patch and use git directly
anxdpanic · Jan 14, 2024 · 0f7a772 · 0f7a772
1 parent 5fda40c
commit 0f7a772
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 619 deletions.
diff --git a/.github/workflows/make-release.yml b/.github/workflows/make-release.yml
@@ -6,6 +6,8 @@ on:
     tags:
       - 'v*'
       - '*-dev'
+      - '*[+]alpha.*'
+      - '*[+]beta.*'
 
 jobs:
   release:
@@ -20,7 +22,7 @@ jobs:
         id: release
         run: |
           version=${GITHUB_REF/refs\/tags\//}
-          if [[ $version == *-dev ]] ;
+          if [[ $version == *-dev || $version == '*+alpha.*' || $version == '*+beta.*' ]] ;
           then
             echo "pre-release=true" >> $GITHUB_OUTPUT
           else
@@ -67,8 +69,9 @@ jobs:
         run: |
           git reset
           git checkout .
+          git fetch origin nexus-unofficial
+          git cherry-pick ...origin/nexus-unofficial
           git clean -fdx
-          git apply .patches/unofficial.patch
           mv .git ..
           rm -rf .??*
           rm *.md
@@ -107,8 +110,9 @@ jobs:
         run: |
           git reset
           git checkout .
+          git fetch origin nexus-unofficial
+          git cherry-pick ...origin/nexus-unofficial
           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"