diff -Nru kodi-pvr-vuplus-7.4.7/debian/changelog kodi-pvr-vuplus-7.4.9/debian/changelog --- kodi-pvr-vuplus-7.4.7/debian/changelog 2015-02-23 15:56:31.000000000 +0000 +++ kodi-pvr-vuplus-7.4.9/debian/changelog 2015-02-23 15:56:31.000000000 +0000 @@ -1,4 +1,4 @@ -kodi-pvr-vuplus (7.4.7-1~bionic) bionic; urgency=low +kodi-pvr-vuplus (7.4.9-1~bionic) bionic; urgency=low [ kodi ] * autogenerated dummy changelog diff -Nru kodi-pvr-vuplus-7.4.7/.github/workflows/changelog-and-release.yml kodi-pvr-vuplus-7.4.9/.github/workflows/changelog-and-release.yml --- kodi-pvr-vuplus-7.4.7/.github/workflows/changelog-and-release.yml 2021-07-15 16:02:28.000000000 +0000 +++ kodi-pvr-vuplus-7.4.9/.github/workflows/changelog-and-release.yml 2021-07-18 17:49:08.000000000 +0000 @@ -15,6 +15,10 @@ description: 'Update news in addon.xml.in? [true|false]' required: true default: 'true' + add_date: + description: 'Add date to version number in changelog and news. ie. "v1.0.1 (2021-7-17)" [true|false]' + required: true + default: 'false' jobs: default: @@ -47,21 +51,26 @@ - name: Increment version and update changelogs run: | + arguments= if [[ ${{ github.event.inputs.update_news }} == true ]] ; then - python3 ../scripts/changelog_and_release.py ${{ github.event.inputs.version_type }} ${{ github.event.inputs.changelog_text }} --update-news - elif [[ ${{ github.event.inputs.update_news }} == false ]] ; + arguments=$(echo $arguments && echo --update-news) + fi + if [[ ${{ github.event.inputs.add_date }} == true ]] ; then - python3 ../scripts/changelog_and_release.py ${{ github.event.inputs.version_type }} ${{ github.event.inputs.changelog_text }} - else - exit 1 + arguments=$(echo $arguments && echo --add-date) fi + python3 ../scripts/changelog_and_release.py ${{ github.event.inputs.version_type }} ${{ github.event.inputs.changelog_text }} $arguments working-directory: ${{ github.event.repository.name }} - name: Get required variables id: required-variables run: | changes=$(cat "$(find . -name changelog.txt)" | awk -v RS= 'NR==1') + if [ -z "$changes" ] ; + then + changes=$(xmlstarlet fo -R "$(find . -name addon.xml.in)" | xmlstarlet sel -t -v 'string(/addon/extension/news)' | awk -v RS= 'NR==1') + fi changes="${changes//'%'/'%25'}" changes="${changes//$'\n'/'%0A'}" changes="${changes//$'\r'/'%0D'}" @@ -72,13 +81,19 @@ echo ::set-output name=version::$version branch=$(echo ${GITHUB_REF#refs/heads/}) echo ::set-output name=branch::$branch + echo ::set-output name=today::$(date +'%Y-%m-%d') working-directory: ${{ github.event.repository.name }} - name: Commit changes run: | git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com" git config --local user.name "github-actions[bot]" - git commit -m "changelog and version v${{ steps.required-variables.outputs.version }}" -a + commit_message="changelog and version v${{ steps.required-variables.outputs.version }}" + if [[ ${{ github.event.inputs.add_date }} == true ]] ; + then + commit_message="$commit_message (${{ steps.required-variables.outputs.today }})" + fi + git commit -m "$commit_message" -a working-directory: ${{ github.event.repository.name }} - name: Push changes @@ -87,6 +102,10 @@ branch: ${{ github.ref }} directory: ${{ github.event.repository.name }} + - name: Sleep for 60 seconds + run: sleep 60s + shell: bash + - name: Create Release id: create-release uses: actions/create-release@v1 @@ -98,3 +117,5 @@ body: ${{ steps.required-variables.outputs.changes }} draft: false prerelease: false + commitish: ${{ steps.required-variables.outputs.branch }} + diff -Nru kodi-pvr-vuplus-7.4.7/.github/workflows/sync-addon-metadata-translations.yml kodi-pvr-vuplus-7.4.9/.github/workflows/sync-addon-metadata-translations.yml --- kodi-pvr-vuplus-7.4.7/.github/workflows/sync-addon-metadata-translations.yml 2021-07-15 16:02:28.000000000 +0000 +++ kodi-pvr-vuplus-7.4.9/.github/workflows/sync-addon-metadata-translations.yml 2021-07-18 17:49:08.000000000 +0000 @@ -4,7 +4,7 @@ push: branches: [ Matrix, Nexus ] paths: - - '**addon.xml' + - '**addon.xml.in' - '**resource.language.**strings.po' jobs: diff -Nru kodi-pvr-vuplus-7.4.7/pvr.vuplus/addon.xml.in kodi-pvr-vuplus-7.4.9/pvr.vuplus/addon.xml.in --- kodi-pvr-vuplus-7.4.7/pvr.vuplus/addon.xml.in 2021-07-15 16:02:28.000000000 +0000 +++ kodi-pvr-vuplus-7.4.9/pvr.vuplus/addon.xml.in 2021-07-18 17:49:08.000000000 +0000 @@ -1,7 +1,7 @@ @ADDON_DEPENDS@ @@ -183,6 +183,12 @@ icon.png +v7.4.9 +- Automation test + +v7.4.8 +- Automation test relesae + v7.4.7 - Update: Release bump diff -Nru kodi-pvr-vuplus-7.4.7/pvr.vuplus/changelog.txt kodi-pvr-vuplus-7.4.9/pvr.vuplus/changelog.txt --- kodi-pvr-vuplus-7.4.7/pvr.vuplus/changelog.txt 2021-07-15 16:02:28.000000000 +0000 +++ kodi-pvr-vuplus-7.4.9/pvr.vuplus/changelog.txt 2021-07-18 17:49:08.000000000 +0000 @@ -1,3 +1,9 @@ +v7.4.9 +- Automation test + +v7.4.8 +- Automation test relesae + v7.4.7 - Update: Release bump