From 3280f5afb8a98b2a2d059f6c115769b47f58badf Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 11 Oct 2022 22:02:59 +0200 Subject: [PATCH 1/9] Fixed build tag --- net.retrodeck.retrodeck.appdata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml index 0c451b62..634e98e0 100644 --- a/net.retrodeck.retrodeck.appdata.xml +++ b/net.retrodeck.retrodeck.appdata.xml @@ -70,7 +70,7 @@ - https://github.com/XargonWan/RetroDECK/releases/tag/0.5.5b + https://github.com/XargonWan/RetroDECK/releases/tag/0.5.0b
  • 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.
    • From 08163175ff664cabe07fcdc35f365d3c18d9faad Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 12 Oct 2022 05:14:10 +0200 Subject: [PATCH 2/9] Fixed release tag --- net.retrodeck.retrodeck.appdata.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml index 634e98e0..aa2010c6 100644 --- a/net.retrodeck.retrodeck.appdata.xml +++ b/net.retrodeck.retrodeck.appdata.xml @@ -108,8 +108,6 @@ - - https://github.com/XargonWan/RetroDECK/releases/tag/0.4.4b From de19380cd4d6fb33af45bb73203ff04b2936e146 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 12 Oct 2022 11:06:21 +0200 Subject: [PATCH 3/9] Main on flathub doesn't support push --force --- .github/workflows/flathub_push_main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flathub_push_main.yml b/.github/workflows/flathub_push_main.yml index 82b57ad2..ccd8e2f3 100644 --- a/.github/workflows/flathub_push_main.yml +++ b/.github/workflows/flathub_push_main.yml @@ -81,4 +81,4 @@ jobs: 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 + git push https://${{ secrets.TRIGGER_BUILD_TOKEN }}@github.com/flathub/net.retrodeck.retrodeck.git master From 2d3d2d9bfeae9f50e47925c83119e1cf76eae148 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 12 Oct 2022 11:10:38 +0200 Subject: [PATCH 4/9] Must PR for main --- .github/workflows/flathub_push_main.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/flathub_push_main.yml b/.github/workflows/flathub_push_main.yml index ccd8e2f3..9fdf63b7 100644 --- a/.github/workflows/flathub_push_main.yml +++ b/.github/workflows/flathub_push_main.yml @@ -28,6 +28,8 @@ jobs: git clone --recursive https://github.com/XargonWan/RetroDECK RetroDECK cd $gits_folder/RetroDECK + relname="main-"$(git rev-parse --short HEAD) + git checkout $rd_branch git submodule init git submodule update @@ -37,7 +39,7 @@ jobs: cd $gits_folder/flathub - git checkout master + git checkout -b $relname git rm -rf * git clean -fxd # restroing git index @@ -81,4 +83,4 @@ jobs: git commit -m "Updated flathub/net.retrodeck.retrodeck from RetroDECK/$rd_branch" git remote -v - git push https://${{ secrets.TRIGGER_BUILD_TOKEN }}@github.com/flathub/net.retrodeck.retrodeck.git master + git push https://${{ secrets.TRIGGER_BUILD_TOKEN }}@github.com/flathub/net.retrodeck.retrodeck.git $relname From f5e75efa5ee2d3968517feabe5ae101c7cf35746 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 12 Oct 2022 20:42:11 +0200 Subject: [PATCH 5/9] Restored and updated Yuzu --- net.retrodeck.retrodeck.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 093f6f23..5b3e8280 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -587,12 +587,13 @@ modules: sources: - type: archive url: >- - https://boostorg.jfrog.io/artifactory/main/release/1.79.0/source/boost_1_79_0.tar.bz2 - sha256: 475d589d51a7f8b3ba2ba4eda022b170e562ca3b760ee922c146b6c65856ef39 + https://boostorg.jfrog.io/artifactory/main/release/1.80.0/source/boost_1_80_0.tar.bz2 + sha256: 1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0 x-checker-data: type: anitya project-id: 6845 - url-template: https://boostorg.jfrog.io/artifactory/main/release/$version/source/boost_1_79_0.tar.bz2 + url-template: >- + https://boostorg.jfrog.io/artifactory/main/release/$version/source/boost_1_80_0.tar.bz2 - name: nv-codec-headers make-install-args: - PREFIX=/app @@ -619,8 +620,8 @@ modules: - -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON - -DYUZU_USE_QT_WEB_ENGINE=ON - -DYUZU_USE_BUNDLED_FFMPEG=ON - - -DDISPLAY_VERSION=1150 - - -DBUILD_TAG=mainline-1150 + - -DDISPLAY_VERSION=1195 + - -DBUILD_TAG=mainline-1195 - -DBUILD_REPOSITORY=yuzu-emu/yuzu-mainline #- -DCMAKE_PREFIX_PATH=/run/build/yuzu/_flatpak_build/externals/qt5_5_15_2 build-options: @@ -635,11 +636,11 @@ modules: - install -Dm755 ../yuzu-launcher.sh /app/bin/yuzu-launcher - install -Dm644 ../dist/yuzu.svg /app/share/icons/hicolor/scalable/apps/yuzu.svg sources: - - disable-submodules: true # FLATHUB WORKAROUND + #- disable-submodules: true # FLATHUB WORKAROUND - type: git url: https://github.com/yuzu-emu/yuzu-mainline.git - tag: mainline-0-1171 - commit: 3b25d1fe22f5eee7a046432884d78b25a3950988 + tag: mainline-0-1195 + commit: 04db31a25a51f2daa296776eb4e58496ee74d49e disable-shallow-clone: true x-checker-data: type: git From 87f58e249541b0361813c16aa2fb2f68af23ec54 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 12 Oct 2022 20:54:18 +0200 Subject: [PATCH 6/9] 0.5.1b --- net.retrodeck.retrodeck.appdata.xml | 11 +++++++++++ net.retrodeck.retrodeck.yml | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml index aa2010c6..dd17cdc6 100644 --- a/net.retrodeck.retrodeck.appdata.xml +++ b/net.retrodeck.retrodeck.appdata.xml @@ -69,6 +69,17 @@ + + 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
      • +
    +     +     + https://github.com/XargonWan/RetroDECK/releases/tag/0.5.0b diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 5b3e8280..cea0849f 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -76,7 +76,7 @@ modules: - | git checkout ${GITHUB_REF_NAME} mkdir -p ${FLATPAK_DEST}/retrodeck/ - VERSION="0.5.0b" + VERSION="0.5.1b" if [[ $VERSION == *"cooker"* ]]; then VERSION="cooker-"$(git rev-parse --short HEAD) From 2ea73f56911fb2a0d356d9630a98304effd2df3e Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 12 Oct 2022 23:47:35 +0200 Subject: [PATCH 7/9] Updated installation instructions link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bf9a97b4..09de6e5a 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ No, RetroDECK doesn't support Windows, but the project is fully open source so y ## How can I install it? Just install it from Discover store.
    -However if you want to test the cooker version you can follow the [Installation instructions](https://github.com/XargonWan/RetroDECK/wiki#installation-instructions) on the Wiki +However if you want to test the cooker version you can follow the [Installation instructions](https://github.com/XargonWan/RetroDECK/wiki/How-to:-Getting-started) on the Wiki ## Can I help? Of course, any help is appreciated, and not only by programming, just check out our [Discord](https://discord.gg/Dz3szYsP8g)! From bb9f605514a0c061a508585a9a6e051efbb64e9a Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 13 Oct 2022 09:11:08 +0200 Subject: [PATCH 8/9] Edited appdata --- net.retrodeck.retrodeck.appdata.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml index dd17cdc6..92871991 100644 --- a/net.retrodeck.retrodeck.appdata.xml +++ b/net.retrodeck.retrodeck.appdata.xml @@ -76,6 +76,18 @@
  • 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...
 From a84f20005cacd3be935a79d8036802931e5ead36 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 13 Oct 2022 09:40:46 +0200 Subject: [PATCH 9/9] Fixed main workflow --- .github/workflows/main-selfhosted.yml | 35 +++++++++++++++++---------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/.github/workflows/main-selfhosted.yml b/.github/workflows/main-selfhosted.yml index 00b97b34..0b25a62d 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,13 +33,27 @@ 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-cooker net.retrodeck.retrodeck.yml + + - name: Create Artifact for flathub + run: | + tar -czf ${GITHUB_WORKSPACE}/RetroDECK-Artifact.tar.gz -C ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker . + 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: | @@ -65,7 +74,7 @@ jobs: ( Write release notes here ) - artifacts: "RetroDECK.flatpak" + artifacts: "RetroDECK.flatpak,RetroDECK-Artifact.tar.gz" allowUpdates: true prerelease: true draft: true