From 4b96584dc5cb916022612eb9026f2a1576e31c5d Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 22 Apr 2022 15:21:52 +0900 Subject: [PATCH 1/7] Added branch name to cooker git action --- .github/workflows/cooker.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 974e0651..6215204e 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -37,7 +37,6 @@ jobs: sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo sudo flatpak install -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 - # Runs a set of commands using the runners shell - name: Building flatpak run: | sudo flatpak-builder --user --install --force-clean --repo=local retrodeck-flatpak com.xargon.retrodeck.yml @@ -47,10 +46,15 @@ jobs: id: date run: echo "::set-output name=date::$(date +'%Y%m%d_%H%M')" + - name: Extract branch name + shell: bash + run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" + id: extract_branch + - name: Publish the flatpak in a new cooker release uses: ncipollo/release-action@v1 with: - tag: "${{ steps.date.outputs.date }}" + tag: "${{ steps.extract_branch.outputs.branch }}" + "-" + "${{ steps.date.outputs.date }}" body: | # Release Notes (Cooker) This is a cooker snapshot based on the commit: ${{ github.event.repository.full_name }}@${{github.sha}}. From a378178b8cef8f243008f5449e915ea8e6e871d8 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 22 Apr 2022 15:26:13 +0900 Subject: [PATCH 2/7] Added gitignore --- .gitignore | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..765bfe6e --- /dev/null +++ b/.gitignore @@ -0,0 +1,15 @@ +# OS generated files # +###################### +.DS_Store +.DS_Store? +._* +.Spotlight-V100 +.Trashes +ehthumbs.db +Thumbs.db + +# RetroDECK specific files # +############################ +.flatpak-builder/ +retrodeck-flatpak-cooker/ +retrodeck-flatpak/ From 2519d99d6c60d59b78a1bf11b9dd9ef3c01cd5d7 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 22 Apr 2022 15:29:19 +0900 Subject: [PATCH 3/7] Fixed cooker.yml syntax --- .github/workflows/cooker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 6215204e..b15b8d70 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -54,7 +54,7 @@ jobs: - name: Publish the flatpak in a new cooker release uses: ncipollo/release-action@v1 with: - tag: "${{ steps.extract_branch.outputs.branch }}" + "-" + "${{ steps.date.outputs.date }}" + tag: "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}" body: | # Release Notes (Cooker) This is a cooker snapshot based on the commit: ${{ github.event.repository.full_name }}@${{github.sha}}. From 0295bca85cf70f1b37019d01daec5edd9a867393 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 22 Apr 2022 22:57:41 +0900 Subject: [PATCH 4/7] DOLPHIN: initialized config --- com.xargon.retrodeck.yml | 8 ++++-- emu-configs/Dolphin.ini | 28 +++++++++++++++++++ .../retrodeck-retroarch.cfg | 0 3 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 emu-configs/Dolphin.ini rename retrodeck-retroarch.cfg => emu-configs/retrodeck-retroarch.cfg (100%) diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml index fe7b623b..ff6adb57 100644 --- a/com.xargon.retrodeck.yml +++ b/com.xargon.retrodeck.yml @@ -988,6 +988,10 @@ modules: # Desktop entry - cp com.xargon.retrodeck.desktop /app/share/applications/com.xargon.retrodeck.desktop + # Configuring Dolphin + - mkdir -p /var/config/dolphin-emu/ + - cp Dolphin.ini /var/config/dolphin-emu/ + #cleanup: ['*'] sources: - type: file @@ -998,8 +1002,8 @@ modules: path: es_systems.xml - type: file path: retrodeck.sh - - type: file - path: retrodeck-retroarch.cfg + - type: dir + path: emu-configs - type: file path: tools-gamelist.xml - type: dir diff --git a/emu-configs/Dolphin.ini b/emu-configs/Dolphin.ini new file mode 100644 index 00000000..f7213f93 --- /dev/null +++ b/emu-configs/Dolphin.ini @@ -0,0 +1,28 @@ +[Analytics] +ID = 09426e1e3e44d72728fb46a9e4a54663 +PermissionAsked = True +[Core] +GFXBackend = Vulkan +SelectedLanguage = 0 +SerialPort1 = 255 +SkipIPL = True +SlotA = 8 +SlotB = 255 +[Display] +Fullscreen = True +[GBA] +BIOS = ~/retrodeck/bios/gba_bios.bin +Rom1 = +Rom2 = +Rom3 = +Rom4 = +SavesInRomPath = False +SavesPath = ~/retrodeck/saves/dolphin-emu/GBA/Saves/ +Threads = True +[General] +ISOPath0 = /run/user/1000/doc/9cd3cde7/wii +ISOPath1 = /run/user/1000/doc/14708e0c/gc +ISOPaths = 2 +WiiSDCardPath = ~/retrodeck/saves/dolphin-emu/Wii/sd.raw +[NetPlay] +TraversalChoice = direct diff --git a/retrodeck-retroarch.cfg b/emu-configs/retrodeck-retroarch.cfg similarity index 100% rename from retrodeck-retroarch.cfg rename to emu-configs/retrodeck-retroarch.cfg From 2fa3440b5c1dfbe4b18f0acf3fa9253bb9ce9eb5 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sat, 23 Apr 2022 09:46:59 +0900 Subject: [PATCH 5/7] DOLPHIN: cp fix --- com.xargon.retrodeck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml index ff6adb57..ed7b03f2 100644 --- a/com.xargon.retrodeck.yml +++ b/com.xargon.retrodeck.yml @@ -990,7 +990,7 @@ modules: # Configuring Dolphin - mkdir -p /var/config/dolphin-emu/ - - cp Dolphin.ini /var/config/dolphin-emu/ + - cp Dolphin.ini /var/config/dolphin-emu/Dolphin.ini #cleanup: ['*'] sources: From b7e05a4406b1886f4f1a51220129d68c8af2b67a Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sat, 23 Apr 2022 11:54:24 +0900 Subject: [PATCH 6/7] DOLPHIN: new logic, make retrodeck.sh initalize the emu-config --- com.xargon.retrodeck.yml | 6 +++--- retrodeck.sh | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml index ed7b03f2..5ddd1216 100644 --- a/com.xargon.retrodeck.yml +++ b/com.xargon.retrodeck.yml @@ -988,9 +988,9 @@ modules: # Desktop entry - cp com.xargon.retrodeck.desktop /app/share/applications/com.xargon.retrodeck.desktop - # Configuring Dolphin - - mkdir -p /var/config/dolphin-emu/ - - cp Dolphin.ini /var/config/dolphin-emu/Dolphin.ini + # Configuring Initializing emu-configs (Dolphin) + - mkdir -p ${FLATPAK_DEST}/retrodeck/emu-configs + - cp Dolphin.ini ${FLATPAK_DEST}/retrodeck/emu-configs #cleanup: ['*'] sources: diff --git a/retrodeck.sh b/retrodeck.sh index d3598eb0..064ebaeb 100755 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -72,6 +72,12 @@ then mkdir -p /var/config/retroarch/cores/ cp /app/share/libretro/cores/* /var/config/retroarch/cores/ + # Initializing standalone emulators configs + + #Dolphin + mkdir -p /var/config/dolphin-emu/ + cp /var/config/retroarch/emu-configs/Dolphin.ini /var/config/dolphin-emu/Dolphin.ini + touch ~/retrodeck/.lock kdialog --title "RetroDECK" --msgbox "Initialization completed.\nplease put your roms in:\n\n$roms_folder\n\nand your bioses in\n\n~/retrodeck/bios\n\nThen start the program again.\nIf you wish to change the roms location, you may use the tool located the tools section of RetroDECK.\n\nIt's suggested to add RetroDECK to your Steam Library for a quick access." From 91bc59520602d6dc545cad16acf11453aa481e36 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sat, 23 Apr 2022 15:01:57 +0900 Subject: [PATCH 7/7] Added DOLPHIN --- com.xargon.retrodeck.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml index 5ddd1216..c4e465d2 100644 --- a/com.xargon.retrodeck.yml +++ b/com.xargon.retrodeck.yml @@ -988,7 +988,9 @@ modules: # Desktop entry - cp com.xargon.retrodeck.desktop /app/share/applications/com.xargon.retrodeck.desktop - # Configuring Initializing emu-configs (Dolphin) + # Configuring emulators: + + # Dolphin - mkdir -p ${FLATPAK_DEST}/retrodeck/emu-configs - cp Dolphin.ini ${FLATPAK_DEST}/retrodeck/emu-configs