diff --git a/.github/workflows/TEST_release_info.yml b/.github/workflows/TEST_release_info.yml index 39f5a90c..24bb221b 100644 --- a/.github/workflows/TEST_release_info.yml +++ b/.github/workflows/TEST_release_info.yml @@ -39,8 +39,8 @@ jobs: REL_VER=$(curl -s $appdata | xmlstarlet sel -t -v "//release/@version" | head -1) DES="$(curl -s $appdata | xmlstarlet sel -t -m "//release[1]" -v "description" -n | sed '1,2d;$d;s/^ */- /;/^- $/d')" echo "REL_VER=$REL_VER" >> $GITHUB_ENV - echo -e "# Release Notes\n" >> "body.md" - echo "$DES" >> "body.md" + echo -e "# Release Notes\n" >> "body.md" + echo "$DES" >> "body.md" - name: Publish the flatpak in a new release uses: ncipollo/release-action@v1 diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index c6bc850f..02d8d283 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -64,7 +64,7 @@ jobs: - name: Publish the flatpak in a new cooker release uses: ncipollo/release-action@v1 with: - tag: "${{ steps.generating_buildid.outputs.build-id }}" + tag: "${GITHUB_REF##*/}-${{ steps.generating_buildid.outputs.build-id }}" body: | # Release Notes (Cooker) This is a cooker snapshot based on the commit: ${{ github.event.repository.full_name }}@${{github.sha}}. diff --git a/.github/workflows/main-selfhosted.yml b/.github/workflows/main-selfhosted.yml index 29253348..da3974f5 100644 --- a/.github/workflows/main-selfhosted.yml +++ b/.github/workflows/main-selfhosted.yml @@ -32,7 +32,7 @@ jobs: git pull git submodule init git submodule update - sudo apt install -y flatpak flatpak-builder p7zip-full + sudo apt install -y flatpak flatpak-builder p7zip-full xmlstarlet flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo flatpak install --user -y --noninteractive \ org.kde.Sdk//6.3 \ @@ -59,19 +59,27 @@ jobs: run: | flatpak build-bundle ${GITHUB_WORKSPACE}/local RetroDECK.flatpak net.retrodeck.retrodeck + - name: Getting version info + id: version + run: | + appdata="https://raw.githubusercontent.com/XargonWan/RetroDECK/main/net.retrodeck.retrodeck.appdata.xml" + REL_VER=$(curl -s $appdata | xmlstarlet sel -t -v "//release/@version" | head -1) + DES="$(curl -s $appdata | xmlstarlet sel -t -m "//release[1]" -v "description" -n | sed '1,2d;$d;s/^ */- /;/^- $/d')" + echo "REL_VER=$REL_VER" >> $GITHUB_ENV + echo -e "# Release Notes\n" >> "body.md" + echo "$DES" >> "body.md" + - name: Publish the flatpak in a new release uses: ncipollo/release-action@v1 + env: + REL_VER: ${{ env.REL_VER }} with: - tag: "${{ steps.generating_buildid.outputs.build-id }}" - body: | - # Release Notes - - ( Write release notes here ) - + tag: ${{ env.REL_VER }} + name: "RetroDECK v${{ env.REL_VER }}" + bodyFile: "body.md" artifacts: "RetroDECK.flatpak,RetroDECK-Artifact.tar.gz" allowUpdates: true prerelease: true - draft: true token: ${{ secrets.TRIGGER_BUILD_TOKEN }} repo: RetroDECK continue-on-error: true