From 6806edd61188f4ee2c58e491950804c7df5d061f Mon Sep 17 00:00:00 2001 From: MoojMidge <56883549+MoojMidge@users.noreply.github.com> Date: Fri, 22 Mar 2024 20:39:17 +1100 Subject: [PATCH] Update workflows to use target repository identifier for all releases --- .github/workflows/make-release.yml | 7 ++++--- .github/workflows/submit-release.yml | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/make-release.yml b/.github/workflows/make-release.yml index c90ada102..4b21880e5 100644 --- a/.github/workflows/make-release.yml +++ b/.github/workflows/make-release.yml @@ -59,8 +59,9 @@ jobs: 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}" \ + -u '/addon/@version' -v "${version}+nexus.1" \ addon.xml - filename=${{ github.event.repository.name }}-${version}.zip + filename=${{ github.event.repository.name }}-${version}.nexus.1.zip cd .. zip -r $filename ${{ github.event.repository.name }} mv .git ${{ github.event.repository.name }} @@ -84,9 +85,9 @@ jobs: 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}" \ - -u '/addon/@version' -v "${version}+unofficial.1" \ + -u '/addon/@version' -v "${version}+nexus.unofficial.1" \ addon.xml - filename=${{ github.event.repository.name }}-${version}.unofficial.1.zip + filename=${{ github.event.repository.name }}-${version}.nexus.unofficial.1.zip cd .. zip -r $filename ${{ github.event.repository.name }} mv .git ${{ github.event.repository.name }} diff --git a/.github/workflows/submit-release.yml b/.github/workflows/submit-release.yml index b884fe769..4fc105bfb 100644 --- a/.github/workflows/submit-release.yml +++ b/.github/workflows/submit-release.yml @@ -54,9 +54,10 @@ jobs: news=$(awk '/^## /{rel_num++} {if(rel_num==2){exit} if(rel_num==1){print}}' changelog.txt | sed -E 's/ ?#[[:digit:]]+[., ]?//;s/\r//') xmlstarlet ed -L -P \ -s '/addon/extension[@point="xbmc.addon.metadata"]' -t elem -n news -v "${news:0:1500}" \ + -u '/addon/@version' -v "${version}+nexus.1" \ addon.xml git add . - git commit -m "Update news" + git commit -m "Update news and repository identifier" working-directory: ${{ github.event.repository.name }} - name: Submit to Official Repository (Nexus)