From 3fc62c692f419a36fb0318f13497439662bfbf5d Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Tue, 11 Oct 2022 22:05:02 +0200 Subject: [PATCH 1/5] Initialized 0.6.0b --- net.retrodeck.retrodeck.appdata.xml | 11 ++++++++++- net.retrodeck.retrodeck.yml | 16 ++++++++-------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml index 0c451b62..0f84eb34 100644 --- a/net.retrodeck.retrodeck.appdata.xml +++ b/net.retrodeck.retrodeck.appdata.xml @@ -69,8 +69,17 @@ + + https://github.com/XargonWan/RetroDECK/releases/tag/0.6.0b + +
    +
  • TBD
    • +
+ + + - 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.
    • diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 093f6f23..0f243c47 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -64,11 +64,11 @@ modules: # The version number is hardcoded in /app/retrodeck/version # # UPDATE STEPS FOR MAIN: - # [X] Update the VERSION variable - # [X] Update the appdata.xml with the version number and notes - # [X] change branch into main in version-initialization (first one) - # [X] change branch into main in retrodeck module (last one) - # [X] if header (before modules) was edited, edit it even in flathub.yml + # [ ] Update the VERSION variable + # [ ] Update the appdata.xml with the version number and notes + # [ ] change branch into main in version-initialization (first one) + # [ ] change branch into main in retrodeck module (last one) + # [ ] if header (before modules) was edited, edit it even in flathub.yml # - name: version-initialization buildsystem: simple @@ -76,7 +76,7 @@ modules: - | git checkout ${GITHUB_REF_NAME} mkdir -p ${FLATPAK_DEST}/retrodeck/ - VERSION="0.5.0b" + VERSION="0.6.0b-cooker" if [[ $VERSION == *"cooker"* ]]; then VERSION="cooker-"$(git rev-parse --short HEAD) @@ -86,7 +86,7 @@ modules: sources: - type: git url: https://github.com/XargonWan/RetroDECK.git - branch: main + branch: cooker - name: xmlstarlet config-opts: @@ -1432,4 +1432,4 @@ modules: sources: - type: git url: https://github.com/XargonWan/RetroDECK.git - branch: main + branch: cooker From 4adf9249d677d8b8e7fa9d108198acfbb01d1f3b Mon Sep 17 00:00:00 2001 From: icenine451 Date: Thu, 13 Oct 2022 08:21:30 -0400 Subject: [PATCH 2/5] Citra saves migration to 0.5.0b --- retrodeck.sh | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/retrodeck.sh b/retrodeck.sh index 6fb41758..2770fcd8 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -22,7 +22,7 @@ fi dir_prep() { # This script is creating a symlink preserving old folder contents and moving them in the new one - + # Call me with: # dir prep "real dir" "symlink location" real="$1" @@ -43,7 +43,7 @@ dir_prep() { echo "$real not found, creating it" #DEBUG mkdir -pv "$real" fi - + # creating the symlink echo "linking $real in $symlink" #DEBUG mkdir -pv "$(dirname "$symlink")" # creating the full path except the last folder @@ -72,7 +72,7 @@ tools_init() { standalones_init() { # This script is configuring the standalone emulators with the default files present in emuconfigs folder - + echo "----------------------" echo "Initializing standalone emulators" echo "----------------------" @@ -279,7 +279,7 @@ post_update() { dir_prep "$media_folder" "/var/config/emulationstation/.emulationstation/downloaded_media" dir_prep "$themes_folder" "/var/config/emulationstation/.emulationstation/themes" mkdir -pv $rdhome/.logs #this was added later, maybe safe to remove in a few versions - + # Resetting es_settings, now we need it but in the future I should think a better solution, maybe with sed cp -fv /app/retrodeck/es_settings.xml /var/config/emulationstation/.emulationstation/es_settings.xml @@ -292,6 +292,11 @@ post_update() { mv -fv /var/config/PCSX2/sstates/* $rdhome/states/ps2/pcsx2 mv -fv /var/config/PCSX2/memcards/* $rdhome/saves/ps2/memcards + # Moving Citra saves from legacy location to 0.5.0b structure + + mv -fv $rdhome/saves/Citra/* $rdhome/saves/n3ds/citra + rmdir $rdhome/saves/Citra # Old folder cleanup + versionwheresaveschanged="0.4.5b" # Hardcoded break point between unsorted and sorted saves if [[ $(sed -e "s/\.//g" <<< $hard_version) > $(sed -e "s/\.//g" <<< $versionwheresaveschanged) ]] && [[ ! $(sed -e "s/\.//g" <<< $hard_version) == $(sed -e "s/\.//g" <<< $version) ]]; then # Check if user is upgrading from the version where save organization was changed. Try not to reuse this, it things 0.4.5b is newer than 0.4.5 @@ -387,7 +392,7 @@ post_update() { [[ -n $found ]] && movefile $j $i || echo "ERROR: No ROM match found for state file" $i | sed -e 's/\^/ /g' >> $migration_logfile # If a match is found, run movefile() otherwise warn user of stranded state file done - ) | + ) | zenity --progress \ --icon-name=net.retrodeck.retrodeck \ --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ @@ -433,7 +438,7 @@ browse(){ path_selected=false while [ $path_selected == false ] do - sdcard="$(zenity --file-selection --title="Choose retrodeck folder location" --directory)" + sdcard="$(zenity --file-selection --title="Choose retrodeck folder location" --directory)" echo "Path choosed: $sdcard, answer=$?" zenity --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" \ --cancel-label="No" \ @@ -549,7 +554,7 @@ finit() { rm -rfv /var/config/emulationstation/ rm -rfv /var/config/retrodeck/tools/ mkdir -pv /var/config/emulationstation/ - + # Initializing ES-DE # TODO: after the next update of ES-DE this will not be needed - let's test it emulationstation --home /var/config/emulationstation --create-system-dirs @@ -660,7 +665,7 @@ then #conf_init # Initializing/reading the config file (sourced from global.sh) # ...but the version doesn't match with the config file - if [ "$hard_version" != "$version" ]; + if [ "$hard_version" != "$version" ]; then echo "Config file's version is $version but the actual version is $hard_version" post_update # Executing post update script @@ -671,7 +676,7 @@ then # Else, LOCKFILE IS NOT EXISTING (WAS REMOVED) # if the lock file doesn't exist at all means that it's a fresh install or a triggered reset -else +else echo "Lockfile not found" #conf_init # Initializing/reading the config file (sourced from global.sh) finit # Executing First/Force init From de50f907627bd19b4159e713c614abe54a08ff34 Mon Sep 17 00:00:00 2001 From: icenine451 Date: Thu, 13 Oct 2022 09:02:59 -0400 Subject: [PATCH 3/5] Fix rewind script --- tools/rewind.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/rewind.sh b/tools/rewind.sh index c60c246a..349b7dd3 100755 --- a/tools/rewind.sh +++ b/tools/rewind.sh @@ -9,13 +9,13 @@ zenity --question \ if [ $? == 0 ] #yes, enable then - sed -i 's%rewind_enable = .*%rewind_enable = "true"' $racfg + sed -i 's%rewind_enable = .*%rewind_enable = "true"%' $racfg zenity --info \ --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ --title "RetroDECK" \ --text="Rewind enabled\!\nYou can check on Libretro docs to see which cores supports this function." else # no, disable - sed -i 's%rewind_enable = .*%rewind_enable = "false"' $racfg + sed -i 's%rewind_enable = .*%rewind_enable = "false"%' $racfg zenity --info \ --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ --title "RetroDECK" \ From bfd5b1bea7d0fd836124a8c20a5dc9e679d0b340 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 13 Oct 2022 15:53:30 +0200 Subject: [PATCH 4/5] Fixed video playback (updated ES-DE) [skip ci] --- net.retrodeck.retrodeck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 0f243c47..7cc0b25d 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -232,7 +232,7 @@ modules: sources: - type: git url: https://gitlab.com/es-de/emulationstation-de - branch: 18b2ee412e1bb3ea35ffd6e680ebf1dacda8e0ff + branch: f8d782f1f3b1fba8a119b793edd01f37e0258953 - type: shell commands: - sed -i 's/QUIT EMULATIONSTATION/QUIT RETRODECK/g' es-app/src/guis/GuiMenu.cpp From 021e62609dcaff80ac02d9d5ad8af6bbff6ba229 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 13 Oct 2022 22:14:04 +0200 Subject: [PATCH 5/5] 0.5.2b ready for release [skip ci] --- .github/workflows/flathub_push_main.yml | 6 ---- .github/workflows/main-selfhosted.yml | 42 +++++++++++++------------ net.retrodeck.retrodeck.appdata.xml | 36 +++++++++++++++++---- 3 files changed, 52 insertions(+), 32 deletions(-) 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