Skip to content

Commit

Permalink
Update workflows
Browse files Browse the repository at this point in the history
- Fix make-release for Leia
- Update dependencies
  • Loading branch information
MoojMidge committed Mar 17, 2024
1 parent bc1c972 commit 2a579ca
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/addon-validations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

steps:
- name: Checkout Add-on
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: ${{ github.event.repository.name }}

Expand Down
24 changes: 15 additions & 9 deletions .github/workflows/make-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
fi
- name: Checkout Add-on
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: ${{ github.event.repository.name }}

Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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' \
Expand Down Expand Up @@ -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' \
Expand All @@ -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' \
Expand All @@ -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 ..
Expand All @@ -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' \
Expand All @@ -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 ..
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/submit-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/sync-addon-metadata-translations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand Down

0 comments on commit 2a579ca

Please sign in to comment.