diff --git a/.github/workflows/flathub_push_main.yml b/.github/workflows/flathub_push_main.yml index 82b57ad2..2957a537 100644 --- a/.github/workflows/flathub_push_main.yml +++ b/.github/workflows/flathub_push_main.yml @@ -36,7 +36,6 @@ jobs: #sync -rav --progress --exclude={'res/screenshots/','shared-modules/','rd-submodules/retroarch','.git/','docs','retrodeck-flatpak/','retrodeck-flatpak-cooker/','.flatpak-builder/'} ~/RetroDECK/ ~/flathub/ cd $gits_folder/flathub - git checkout master git rm -rf * @@ -71,14 +70,9 @@ jobs: sed -i "s#__SHA__#$sha#g" net.retrodeck.retrodeck.yml - echo -e "Resulting manifest:\n" - cat net.retrodeck.retrodeck.yml - git config --global user.name "${{ secrets.GITNAME }}" git config --global user.email "${{ secrets.GITMAIL }}" git add * git commit -m "Updated flathub/net.retrodeck.retrodeck from RetroDECK/$rd_branch" - - git remote -v git push --force https://${{ secrets.TRIGGER_BUILD_TOKEN }}@github.com/flathub/net.retrodeck.retrodeck.git master diff --git a/.github/workflows/main-selfhosted.yml b/.github/workflows/main-selfhosted.yml index 00b97b34..d7ac14c2 100644 --- a/.github/workflows/main-selfhosted.yml +++ b/.github/workflows/main-selfhosted.yml @@ -17,18 +17,13 @@ jobs: runs-on: self-hosted steps: - - name: Get date for artifacts - id: date - run: echo "::set-output name=date::$(date +'%Y%m%d_%H%M%S')" - - - name: Extract branch name - shell: bash - run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" - id: extract_branch + - name: Remove stuck mounts + run: sudo umount -f /home/administrator/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles/* + continue-on-error: true - name: Generate build ID id: generating_buildid - run: echo "##[set-output name=build-id;]$(echo "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}")" + run: echo "##[set-output name=build-id;]$(echo "$( git rev-parse --short HEAD )")" - uses: actions/checkout@v3 @@ -38,34 +33,41 @@ jobs: git submodule init git submodule update sudo apt install -y flatpak flatpak-builder p7zip-full - flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - flatpak install --user -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 io.qt.qtwebengine.BaseApp/x86_64/5.15-21.08 org.freedesktop.Sdk.Extension.llvm13 + flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo + flatpak install --user -y --noninteractive \ + org.kde.Sdk//6.3 \ + org.kde.Platform//6.3 \ + org.freedesktop.Platform.ffmpeg-full/x86_64/21.08 \ + io.qt.qtwebengine.BaseApp/x86_64/6.3 \ + org.freedesktop.Sdk.Extension.llvm13 \ + org.freedesktop.Sdk.Extension.dotnet6/x86_64/21.08 - # for main remember to change ${HOME} into ${GITHUB_WORKSPACE} - name: Build flatpak run: | - flatpak-builder --build-only --user --force-clean --repo=${GITHUB_WORKSPACE}/local ${GITHUB_WORKSPACE}/retrodeck-flatpak-main net.retrodeck.retrodeck.yml + flatpak-builder --user --force-clean --install-deps-from=flathub --install-deps-from=flathub-beta --repo=${GITHUB_WORKSPACE}/local ${GITHUB_WORKSPACE}/retrodeck-flatpak-main net.retrodeck.retrodeck.yml + + - name: Create Artifact for flathub + run: | + tar -czf ${GITHUB_WORKSPACE}/RetroDECK-Artifact.tar.gz -C ${GITHUB_WORKSPACE}/retrodeck-flatpak-main . + hash=($(sha256sum ${GITHUB_WORKSPACE}/RetroDECK-Artifact.tar.gz)) + echo $hash > ${GITHUB_WORKSPACE}/RetroDECK-Artifact.sha + mv -f RetroDECK-Artifact.* ${{ secrets.ARTIFACT_REPO }} + continue-on-error: true - name: Create Bundle run: | - flatpak-builder --user --force-clean --repo=${GITHUB_WORKSPACE}/local ${GITHUB_WORKSPACE}/retrodeck-flatpak-main net.retrodeck.retrodeck.yml flatpak build-bundle ${GITHUB_WORKSPACE}/local RetroDECK.flatpak net.retrodeck.retrodeck - - name: Read version from version file - id: version - run: echo "##[set-output name=version;]$(cat $(find . -name version))" - - name: Publish the flatpak in a new release uses: ncipollo/release-action@v1 with: - #tag: "${{ steps.version.outputs.version }}" tag: "${{ steps.generating_buildid.outputs.build-id }}" body: | # Release Notes ( Write release notes here ) - artifacts: "RetroDECK.flatpak" + artifacts: "RetroDECK.flatpak,RetroDECK-Artifact.tar.gz" allowUpdates: true prerelease: true draft: true diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml index 0f84eb34..46035c18 100644 --- a/net.retrodeck.retrodeck.appdata.xml +++ b/net.retrodeck.retrodeck.appdata.xml @@ -69,11 +69,37 @@ - - https://github.com/XargonWan/RetroDECK/releases/tag/0.6.0b + + https://github.com/XargonWan/RetroDECK/releases/tag/0.5.2b
    -
  • TBD
    • +
  • VERY IMPORTANT: We are moving your saves! This can take time on the first boot. If you miss some saves they are not gone. Please read more in the wiki.
    • +
  • Fixed Citra save migration folder
    • +
  • Fixed a bug where the videos were not played correctly in some cases
    • +
  • Fixed the Rewind tool
    • +
+ + + + + https://github.com/XargonWan/RetroDECK/releases/tag/0.5.1b + +
    +
  • VERY IMPORTANT: We are moving your saves! This can take time on the first boot. If you miss some saves they are not gone. Please read more in the wiki.
    • +
  • Fixed a bug where Yuzu was not compiled correctly
    • +
  • Updated Yuzu
    • +
  • New Logo and Theme
    • +
  • Two new themes added: Alekfull-NX-Light and Retrofix-Revisited
    • +
  • Updated ES-DE to 1.2.6
    • +
  • Implemented the first steps towards a universal Emulator Configuration Tool in the TOOLS menu
    • +
  • Ability to log into your RetroAchievements account under the TOOLS menu for RetroArch only (supported standalones coming soon)
    • +
  • Updated RetroArch and all the standalone emulators
    • +
  • Added several free assets/fonts for RetroArch, PPSSPP, XEMU and BlueMSX
    • +
  • Added a new DEFAULT Emulator for the PS2: PCSX2-QT (the former PCSX2 default emulator is now called "PCSX2 (Legacy)")
    • +
  • Changed the DEFAULT Emulator for the PSX: Swanstation (Libretro) Core
    • +
  • Added a new Standalone Emulator for the PSX: Duckstation
    • +
  • Enhanced XEMU (XBOX) experience
    • +
  • And more, for the complete patch notes please check the wiki...
 @@ -117,8 +143,6 @@ - - https://github.com/XargonWan/RetroDECK/releases/tag/0.4.4b @@ -374,4 +398,4 @@ - + \ No newline at end of file