From 4f346a501853d54552eb7f31884e87afac86cdd2 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 8 Jul 2024 20:17:38 +0900 Subject: [PATCH 01/10] Workflows: added a workflow to check for emulator updates --- .github/workflows/emulator-updates.yaml | 56 +++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 .github/workflows/emulator-updates.yaml diff --git a/.github/workflows/emulator-updates.yaml b/.github/workflows/emulator-updates.yaml new file mode 100644 index 00000000..4a5f9587 --- /dev/null +++ b/.github/workflows/emulator-updates.yaml @@ -0,0 +1,56 @@ +name: Check Emulator Updates + +on: + schedule: + - cron: '0 18 * * *' # Controlla ogni giorno alle 18:00 UTC (3:00 JST) + push: + branches: + - main + workflow_dispatch: + +jobs: + check-updates: + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + + - name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: '3.x' + + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install flatpak-builder-tools + + - name: Check for emulator updates + run: | + flatpak-builder --check-updates ./net.retrodeck.retrodeck.yml --modules "modulo1,modulo2" # Sostituisci modulo1,modulo2 con i tuoi moduli specifici + + - name: Configure Git + run: | + git config --global user.name "github-actions[bot]" + git config --global user.email "github-actions[bot]@users.noreply.github.com" + + - name: Create or update branch + run: | + git fetch origin + if git rev-parse --verify origin/feat/auto-emulator-updates; then + git branch -D feat/auto-emulator-updates + fi + git checkout -b feat/auto-emulator-updates + git add . + git commit -m "Update emulators" + git push --set-upstream origin feat/auto-emulator-updates --force + + - name: Create Pull Request + uses: peter-evans/create-pull-request@v5 + with: + token: ${{ secrets.GITHUB_TOKEN }} + source: feat/auto-emulator-updates + destination: cooker-0.8.2b + title: 'Automated Emulator Updates' + body: 'This PR contains automated updates for specified emulators.' From 07526be3bf5eab959448d330dddcfb214a41889a Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 8 Jul 2024 20:24:39 +0900 Subject: [PATCH 02/10] Workflows: disabled emulators update checker pipeline [skip ci] --- .github/workflows/emulator-updates.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/emulator-updates.yaml b/.github/workflows/emulator-updates.yaml index 4a5f9587..d55cd4a7 100644 --- a/.github/workflows/emulator-updates.yaml +++ b/.github/workflows/emulator-updates.yaml @@ -1,8 +1,8 @@ name: Check Emulator Updates on: - schedule: - - cron: '0 18 * * *' # Controlla ogni giorno alle 18:00 UTC (3:00 JST) + # schedule: + # - cron: '0 18 * * *' push: branches: - main From 6983218fbbd782dfa767a54673405cbe94dbc2cb Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 15 Jul 2024 12:39:24 +0900 Subject: [PATCH 03/10] RetroDECK v0.8.2b --- net.retrodeck.retrodeck.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 60cb678a..5f3839c0 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -68,8 +68,8 @@ modules: # The version number is hardcoded in /app/retrodeck/version # # UPDATE STEPS FOR MAIN: - # [ ] Update the VERSION variable on line containing "VERSION=THISBRANCH" - # [ ] Update the appdata.xml with the version number and notes + # [X] Update the VERSION variable on line containing "VERSION=THISBRANCH" + # [X] Update the appdata.xml with the version number and notes # - name: version-initialization buildsystem: simple @@ -78,7 +78,7 @@ modules: # on main please update this with the version variable, eg: VERSION=0.8.0b # on cooker will be THISBRANCH - VERSION=THISBRANCH + VERSION=0.8.2b git checkout ${GITHUB_REF_NAME} mkdir -p ${FLATPAK_DEST}/retrodeck/ From f51e36aead09ce5979707bbb47558612e7f24ea6 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 18 Jul 2024 22:07:14 +0900 Subject: [PATCH 04/10] APPDATA: updated the release date to reflect the refresh --- 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 00d10b25..01f47151 100644 --- a/net.retrodeck.retrodeck.appdata.xml +++ b/net.retrodeck.retrodeck.appdata.xml @@ -67,7 +67,7 @@ GPL-3.0 CC0-1.0 - + https://github.com/XargonWan/RetroDECK/releases/tag/0.8.2b

Changes:

From ffeef055aab13cc9a4148b0aabf7c82a12ab3dea Mon Sep 17 00:00:00 2001 From: icenine451 <59938822+icenine451@users.noreply.github.com> Date: Sun, 21 Jul 2024 18:33:24 -0400 Subject: [PATCH 05/10] Fix failed move commands in 0.8.2b post_update and add recovery for previous failed moves in 0.8.3b --- functions/post_update.sh | 43 +++++++++++++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 9 deletions(-) diff --git a/functions/post_update.sh b/functions/post_update.sh index 39b18a27..c543cefb 100644 --- a/functions/post_update.sh +++ b/functions/post_update.sh @@ -304,7 +304,7 @@ post_update() { log i "In version 0.8.1b, the following changes were made that required config file updates/reset or other changes to the filesystem:" log i "- ES-DE files were moved inside the retrodeck folder, migrating to the new structure" log i "- Give the user the option to reset Ryujinx, which was not properly initialized in 0.8.0b" - + log d "ES-DE files were moved inside the retrodeck folder, migrating to the new structure" dir_prep "$rdhome/ES-DE/collections" "/var/config/ES-DE/collections" dir_prep "$rdhome/ES-DE/gamelists" "/var/config/ES-DE/gamelists" @@ -339,14 +339,39 @@ post_update() { fi if [[ $(check_version_is_older_than "0.8.2b") == "true" ]]; then - log i "Vita3K changed some paths, reflecting them: moving \"/var/data/Vita3K\" in \"/var/config/Vita3K\"" - mv -f "/var/data/Vita3K" "/var/config/Vita3K" - log i "Moving ES-DE downloaded_media, gamelist, and themes from \"$rdhome\" to \"$rdhome/ES-DE\" due to a RetroDECK Framework bug" - mv -f "$rdhome/themes" "$rdhome/ES-DE/themes" && log d "Move of \"$rdhome/themes\" completed" - mv -f "$rdhome/downloaded_media" "$rdhome/ES-DE/downloaded_media" && log d "Move of \"$rdhome/downloaded_media\" completed" - mv -f "$rdhome/gamelists/"* "$rdhome/ES-DE/gamelists" && log d "Move of \"$rdhome/gamelists/\" completed" && rm -rf "$rdhome/gamelists" - log i "Since in this version we moved to a PR build of Ryujinx we need to symlink it." - ln -sv $ryujinxconf "$(dirname $ryujinxconf)/PRConfig.json" + log i "Vita3K changed some paths, reflecting them: moving \"/var/data/Vita3K\" in \"/var/config/Vita3K\"" + move "/var/data/Vita3K" "/var/config/Vita3K" + log i "Moving ES-DE downloaded_media, gamelist, and themes from \"$rdhome\" to \"$rdhome/ES-DE\" due to a RetroDECK Framework bug" + move "$rdhome/themes" "$rdhome/ES-DE/themes" && log d "Move of \"$rdhome/themes\" completed" + move "$rdhome/downloaded_media" "$rdhome/ES-DE/downloaded_media" && log d "Move of \"$rdhome/downloaded_media\" completed" + move "$rdhome/gamelists" "$rdhome/ES-DE/gamelists" && log d "Move of \"$rdhome/gamelists/\" completed" + log i "Since in this version we moved to a PR build of Ryujinx we need to symlink it." + ln -sv $ryujinxconf "$(dirname $ryujinxconf)/PRConfig.json" + fi + + if [[ $(check_version_is_older_than "0.8.3b") == "true" ]]; then + # In version 0.8.3b, the following changes were made: + # - Recovery from a failed move of the themes, downloaded_media and gamelists folder to their new ES-DE locations. + if [[ !-d "$rdhome/ES-DE/themes" || ! -d "$rdhome/ES-DE/downloaded_media" || ! -d "$rdhome/ES-DE/gamelists" ]]; then + log i "Moving ES-DE downloaded_media, gamelist, and themes from \"$rdhome\" to \"$rdhome/ES-DE\" due to a RetroDECK Framework bug" + if [[ -d "$rdhome/themes" && ! -d "$rdhome/ES-DE/themes" ]]; then + move "$rdhome/themes" "$rdhome/ES-DE/themes" && log d "Move of \"$rdhome/themes\" completed" + else + log i "ES-DE themes appears to already have been migrated." + fi + if [[ -d "$rdhome/downloaded_media" && ! -d "$rdhome/ES-DE/downloaded_media" ]]; then + move "$rdhome/downloaded_media" "$rdhome/ES-DE/downloaded_media" && log d "Move of \"$rdhome/downloaded_media\" completed" + else + log i "ES-DE downloaded media appears to already have been migrated." + fi + if [[ -d "$rdhome/gamelists" && ! -d "$rdhome/ES-DE/gamelists" ]]; then + move "$rdhome/gamelists" "$rdhome/ES-DE/gamelists" && log d "Move of \"$rdhome/gamelists/\" completed" + else + log i "ES-DE gamelists appears to already have been migrated." + fi + else + log i "ES-DE dfolders appears to already have been migrated." + fi fi # if [[ $(check_version_is_older_than "0.9.0b") == "true" ]]; then From 12ab63c22fdb63edbfc204ffb72075bafee7ef4f Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 22 Jul 2024 09:12:58 +0900 Subject: [PATCH 06/10] Init of 0.8.3b with folder move bufixes --- net.retrodeck.retrodeck.appdata.xml | 17 ++++++++++++++++- net.retrodeck.retrodeck.yml | 2 +- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml index 01f47151..e34ea9da 100644 --- a/net.retrodeck.retrodeck.appdata.xml +++ b/net.retrodeck.retrodeck.appdata.xml @@ -67,6 +67,20 @@ GPL-3.0 CC0-1.0 + + https://github.com/XargonWan/RetroDECK/releases/tag/0.8.3b + +

Big fixes:

+
    +
  • Fixed a bug where the ES-DE folders where not correctly migrated from retrodeck folder to retrodeck/ES-DE folder
    • +
+

Known issues:

+
    +
  • Ryujinx is broken in this version, we plan to fix it soon, check the known issues to learn more
    • +
  • Please check the know issues in the Wiki under General Information
    • +
+ + https://github.com/XargonWan/RetroDECK/releases/tag/0.8.2b @@ -89,7 +103,8 @@

Known issues:

    -
  • Please check the know issues in the Wiki under General Information.
    • +
  • Ryujinx is broken in this version, we plan to fix it soon, check the known issues to learn more
    • +
  • Please check the know issues in the Wiki under General Information
 diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 6f9c3182..9a756b69 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -78,7 +78,7 @@ modules: # on main please update this with the version variable, eg: VERSION=0.8.0b # on cooker will be THISBRANCH - VERSION=0.8.2b + VERSION=0.8.3b git checkout ${GITHUB_REF_NAME} mkdir -p ${FLATPAK_DEST}/retrodeck/ From 4e5e68638613a3a90f1a0adcfcc56eaa8909201d Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 22 Jul 2024 14:19:02 +0900 Subject: [PATCH 07/10] MANIFEST: forgot that we are in a cooker branch --- 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 9a756b69..cbe1c5c1 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -78,7 +78,7 @@ modules: # on main please update this with the version variable, eg: VERSION=0.8.0b # on cooker will be THISBRANCH - VERSION=0.8.3b + VERSION=cooker-0.8.3b git checkout ${GITHUB_REF_NAME} mkdir -p ${FLATPAK_DEST}/retrodeck/ From de623f4ee194c25e9dbbd91a8480ed9cdae4713d Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 22 Jul 2024 14:23:08 +0900 Subject: [PATCH 08/10] POST_UPDATE: added collections folder --- functions/post_update.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/functions/post_update.sh b/functions/post_update.sh index c543cefb..1dcb8ab1 100644 --- a/functions/post_update.sh +++ b/functions/post_update.sh @@ -352,7 +352,7 @@ post_update() { if [[ $(check_version_is_older_than "0.8.3b") == "true" ]]; then # In version 0.8.3b, the following changes were made: # - Recovery from a failed move of the themes, downloaded_media and gamelists folder to their new ES-DE locations. - if [[ !-d "$rdhome/ES-DE/themes" || ! -d "$rdhome/ES-DE/downloaded_media" || ! -d "$rdhome/ES-DE/gamelists" ]]; then + if [[ !-d "$rdhome/ES-DE/themes" || ! -d "$rdhome/ES-DE/downloaded_media" || ! -d "$rdhome/ES-DE/gamelists" || ! -d "$rdhome/ES-DE/collections" ]]; then log i "Moving ES-DE downloaded_media, gamelist, and themes from \"$rdhome\" to \"$rdhome/ES-DE\" due to a RetroDECK Framework bug" if [[ -d "$rdhome/themes" && ! -d "$rdhome/ES-DE/themes" ]]; then move "$rdhome/themes" "$rdhome/ES-DE/themes" && log d "Move of \"$rdhome/themes\" completed" @@ -369,8 +369,13 @@ post_update() { else log i "ES-DE gamelists appears to already have been migrated." fi + if [[ -d "$rdhome/collections" && ! -d "$rdhome/ES-DE/collections" ]]; then + move "$rdhome/collections" "$rdhome/ES-DE/collections" && log d "Move of \"$rdhome/collections/\" completed" + else + log i "ES-DE collections appears to already have been migrated." + fi else - log i "ES-DE dfolders appears to already have been migrated." + log i "ES-DE folders appears to already have been migrated." fi fi From ee628ae596e1aefe0dfad1dc7df9a2780a859d25 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 22 Jul 2024 14:41:35 +0900 Subject: [PATCH 09/10] WORKFLOW: added branch/cooker* to the triggers [skip ci[ --- .github/workflows/cooker-selfhosted.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index 8dfc36fa..411662b5 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -5,6 +5,7 @@ on: branches: - cooker* - feat* + - branch/cooker* paths: - '.github/workflows/**' - 'automation_tools/**' From 8984a4204da836b5009d611c106fafa642b953b7 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 22 Jul 2024 19:00:52 +0900 Subject: [PATCH 10/10] RYUJINX:TEST, reverting to reported working version --- net.retrodeck.retrodeck.yml | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index cbe1c5c1..0cec04a9 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -1232,21 +1232,34 @@ modules: # url: https://github.com/Ryujinx/release-channel-master/releases/download/1.1.1343/ryujinx-1.1.1343-linux_x64.tar.gz # sha256: 3cd2172d2f42a0fb93a83bffe6bd8fb2d1d81fb45afc80e0068a245c8f755ac1 - - name: Ryujinx-with-symlink-fix + # - name: Ryujinx-with-symlink-fix + # buildsystem: simple + # build-commands: + # - | + # mkdir -p ${FLATPAK_DEST}/ryujinx + # mkdir -p ${FLATPAK_DEST}/bin + # chmod +x Ryujinx.sh + # chmod +x Ryujinx + # mv -v * ${FLATPAK_DEST}/ryujinx + # ln -sv ${FLATPAK_DEST}/ryujinx/Ryujinx.sh ${FLATPAK_DEST}/bin/Ryujinx.sh + # chmod +x ${FLATPAK_DEST}/bin/Ryujinx.sh + # sources: + # - type: archive + # url: https://gitlab.com/-/project/59825450/uploads/8519a04d7a3f5b5949f14b6ad25a4185/ryujinx-Release-1.1.0+81fd228-linux_x64.zip + # sha256: 9e4a4393a3dcc44fda2aec40c2842492e30656c7369a9959d865a3351f12eeb9 + + # This version was reported as working with symlinks: https://discord.com/channels/951662718102962256/951715885968654418/1264882000658169866 + - name: Ryujinx-reported-working-version buildsystem: simple build-commands: - | - mkdir -p ${FLATPAK_DEST}/ryujinx - mkdir -p ${FLATPAK_DEST}/bin - chmod +x Ryujinx.sh - chmod +x Ryujinx - mv -v * ${FLATPAK_DEST}/ryujinx - ln -sv ${FLATPAK_DEST}/ryujinx/Ryujinx.sh ${FLATPAK_DEST}/bin/Ryujinx.sh - chmod +x ${FLATPAK_DEST}/bin/Ryujinx.sh + tar -zxvf *.tar.gz + mv -v publish ${FLATPAK_DEST}/ryujinx + ln -sv ${FLATPAK_DEST}/ryujinx/Ryujinx ${FLATPAK_DEST}/bin/Ryujinx.sh sources: - - type: archive - url: https://gitlab.com/-/project/59825450/uploads/8519a04d7a3f5b5949f14b6ad25a4185/ryujinx-Release-1.1.0+81fd228-linux_x64.zip - sha256: 9e4a4393a3dcc44fda2aec40c2842492e30656c7369a9959d865a3351f12eeb9 + - type: file + url: https://github.com/Ryujinx/release-channel-master/releases/download/1.1.1297/ryujinx-1.1.1297-linux_x64.tar.gz + sha256: 28b38754e7d2e92083b313b23278c180ae54ac025edbbd0276ec03baec0cec0f # Ryujinx Appimage - END