Update workflows

- Remove Kodi version identifier for main release
- Combine release details into single identifier rather than concatenating them
This commit is contained in:
MoojMidge 2024-03-30 11:33:16 +11:00
parent d4550efaff
commit 6ff4ea978c
2 changed files with 14 additions and 11 deletions

View file

@ -59,9 +59,8 @@ jobs:
version=$(xmlstarlet sel -t -v 'string(/addon/@version)' addon.xml) version=$(xmlstarlet sel -t -v 'string(/addon/@version)' addon.xml)
xmlstarlet ed -L -P \ xmlstarlet ed -L -P \
-s '/addon/extension[@point="xbmc.addon.metadata"]' -t elem -n news -v "${news:0:1500}" \ -s '/addon/extension[@point="xbmc.addon.metadata"]' -t elem -n news -v "${news:0:1500}" \
-u '/addon/@version' -v "${version}+matrix.1" \
addon.xml addon.xml
filename=${{ github.event.repository.name }}-${version}.matrix.1.zip filename=${{ github.event.repository.name }}-${version}.zip
cd .. cd ..
zip -r $filename ${{ github.event.repository.name }} zip -r $filename ${{ github.event.repository.name }}
mv .git ${{ github.event.repository.name }} mv .git ${{ github.event.repository.name }}
@ -83,11 +82,13 @@ jobs:
rm *.md rm *.md
news=$(awk '/^## /{rel_num++} {if(rel_num==2){exit} if(rel_num==1){print}}' changelog.txt | sed -E 's/ ?#[[:digit:]]+[., ]?//;s/\r//') 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) version=$(xmlstarlet sel -t -v 'string(/addon/@version)' addon.xml)
version="${version}+unofficial.1"
version=${version/+/!}; version=${version//+/.}; version=${version/!/+}
xmlstarlet ed -L -P \ xmlstarlet ed -L -P \
-s '/addon/extension[@point="xbmc.addon.metadata"]' -t elem -n news -v "${news:0:1500}" \ -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/@version' -v "${version}" \
addon.xml addon.xml
filename=${{ github.event.repository.name }}-${version}.matrix.unofficial.1.zip filename=${{ github.event.repository.name }}-${version}.zip
cd .. cd ..
zip -r $filename ${{ github.event.repository.name }} zip -r $filename ${{ github.event.repository.name }}
mv .git ${{ github.event.repository.name }} mv .git ${{ github.event.repository.name }}
@ -105,9 +106,11 @@ jobs:
rm *.md rm *.md
news=$(awk '/^## /{rel_num++} {if(rel_num==2){exit} if(rel_num==1){print}}' changelog.txt | sed -E 's/ ?#[[:digit:]]+[., ]?//;s/\r//') 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) version=$(xmlstarlet sel -t -v 'string(/addon/@version)' addon.xml)
version="${version}+leia.1"
version=${version/+/!}; version=${version//+/.}; version=${version/!/+}
xmlstarlet ed -L -P \ xmlstarlet ed -L -P \
-s '/addon/extension[@point="xbmc.addon.metadata"]' -t elem -n news -v "${news:0:1500}" \ -s '/addon/extension[@point="xbmc.addon.metadata"]' -t elem -n news -v "${news:0:1500}" \
-u '/addon/@version' -v "${version}+leia.1" \ -u '/addon/@version' -v "${version}" \
-u '/addon/requires/import[@addon="xbmc.python"]/@version' -v '2.26.0' \ -u '/addon/requires/import[@addon="xbmc.python"]/@version' -v '2.26.0' \
-d '/addon/requires/import[@addon="script.module.requests"]/@version' \ -d '/addon/requires/import[@addon="script.module.requests"]/@version' \
-d '/addon/requires/import[@addon="inputstream.adaptive"]/@version' \ -d '/addon/requires/import[@addon="inputstream.adaptive"]/@version' \
@ -116,7 +119,7 @@ jobs:
-s '/addon/requires/import_temp' -t attr -n addon -v 'script.module.kodi-six' \ -s '/addon/requires/import_temp' -t attr -n addon -v 'script.module.kodi-six' \
-r '/addon/requires/import_temp' -v import \ -r '/addon/requires/import_temp' -v import \
addon.xml addon.xml
filename=${{ github.event.repository.name }}-${version}.leia.1.zip filename=${{ github.event.repository.name }}-${version}.zip
cd .. cd ..
zip -r $filename ${{ github.event.repository.name }} zip -r $filename ${{ github.event.repository.name }}
mv .git ${{ github.event.repository.name }} mv .git ${{ github.event.repository.name }}
@ -138,9 +141,11 @@ jobs:
rm *.md rm *.md
news=$(awk '/^## /{rel_num++} {if(rel_num==2){exit} if(rel_num==1){print}}' changelog.txt | sed -E 's/ ?#[[:digit:]]+[., ]?//;s/\r//') 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) version=$(xmlstarlet sel -t -v 'string(/addon/@version)' addon.xml)
version="${version}+leia.unofficial.1"
version=${version/+/!}; version=${version//+/.}; version=${version/!/+}
xmlstarlet ed -L -P \ xmlstarlet ed -L -P \
-s '/addon/extension[@point="xbmc.addon.metadata"]' -t elem -n news -v "${news:0:1500}" \ -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/@version' -v "${version}" \
-u '/addon/requires/import[@addon="xbmc.python"]/@version' -v '2.26.0' \ -u '/addon/requires/import[@addon="xbmc.python"]/@version' -v '2.26.0' \
-d '/addon/requires/import[@addon="script.module.requests"]/@version' \ -d '/addon/requires/import[@addon="script.module.requests"]/@version' \
-d '/addon/requires/import[@addon="inputstream.adaptive"]/@version' \ -d '/addon/requires/import[@addon="inputstream.adaptive"]/@version' \
@ -149,7 +154,7 @@ jobs:
-s '/addon/requires/import_temp' -t attr -n addon -v 'script.module.kodi-six' \ -s '/addon/requires/import_temp' -t attr -n addon -v 'script.module.kodi-six' \
-r '/addon/requires/import_temp' -v import \ -r '/addon/requires/import_temp' -v import \
addon.xml addon.xml
filename=${{ github.event.repository.name }}-${version}.leia.unofficial.1.zip filename=${{ github.event.repository.name }}-${version}.zip
cd .. cd ..
zip -r $filename ${{ github.event.repository.name }} zip -r $filename ${{ github.event.repository.name }}
mv .git ${{ github.event.repository.name }} mv .git ${{ github.event.repository.name }}

View file

@ -52,13 +52,11 @@ jobs:
git add . git add .
git commit -m "Remove Unwanted Files" git commit -m "Remove Unwanted Files"
news=$(awk '/^## /{rel_num++} {if(rel_num==2){exit} if(rel_num==1){print}}' changelog.txt | sed -E 's/ ?#[[:digit:]]+[., ]?//;s/\r//') 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 \ xmlstarlet ed -L -P \
-s '/addon/extension[@point="xbmc.addon.metadata"]' -t elem -n news -v "${news:0:1500}" \ -s '/addon/extension[@point="xbmc.addon.metadata"]' -t elem -n news -v "${news:0:1500}" \
-u '/addon/@version' -v "${version}+matrix.1" \
addon.xml addon.xml
git add . git add .
git commit -m "Update news and repository identifier" git commit -m "Update news"
working-directory: ${{ github.event.repository.name }} working-directory: ${{ github.event.repository.name }}
- name: Submit to Official Repository - name: Submit to Official Repository