Merge branch 'retrodeck-main' into feat/smaller-menu [skip ci]

.github/workflows/build_es-de.yml

@@ -4,26 +4,21 @@ on:
   push:
     branches:
      - retrodeck-main
+     - main
      - feat/*
   workflow_dispatch:
 
-
 jobs:
-
   Building_RetroDECK-ES-DE:
     runs-on: ubuntu-latest
     steps:
 
-      # Circumventing this bug: https://github.com/flatpak/flatpak-builder/issues/317
+      - name: Clone RetroDECK repo
-      # - name: Remove stuck mounts
-      #   run: sudo umount -f /home/ubuntu/es-de-runner/_work/RetroDECK-ES-DE/RetroDECK-ES-DE/.flatpak-builder/rofiles/*
-      #   continue-on-error: true
-    
-      - name: Clone repo
         uses: actions/checkout@v3
         with:
-          submodules: 'true'
+          submodules: 'recursive'
           token: ${{ secrets.TRIGGER_BUILD_TOKEN }}
+          fetch-depth: 1
 
       - name: "Install dependencies"
         run: "automation_tools/install_dependencies.sh"
@@ -84,24 +79,33 @@ jobs:
           token: ${{ secrets.TRIGGER_BUILD_TOKEN }}
         continue-on-error: true
 
-      # - name: "Committing changes"
+      # - name: Clone Cooker repo
-      #   with: 
+      #   if: contains(env.BRANCH_NAME, 'feat/') == false
-      #     github_token: ${{ secrets.TRIGGER_BUILD_TOKEN }}
+      #   uses: actions/checkout@v3
+      #   with:
+      #     repository: RetroDECK/RetroDECK
+      #     #ref: cooker
+      #     ref: feat/lighter-manifest # TODO: put cooker when this is merged
+      #     submodules: 'recursive'
+      #     token: ${{ secrets.TRIGGER_BUILD_TOKEN }}
+      #     path: cooker
+
+      # - name: "Update RetroDECK Cooker manifest with new artifact URL and SHA256"
+      #   if: contains(env.BRANCH_NAME, 'feat/') == false
       #   run: |
+      #     NEW_URL="https://github.com/RetroDECK/ES-DE/releases/download/${{env.BRANCH_NAME}}-${{env.DATE}}/RetroDECK-ES-DE-Artifact.tar.gz"
+      #     NEW_SHA256=$(cat ${GITHUB_WORKSPACE}/RetroDECK-Artifact-cooker.sha)
+
+      #     yq e -i '.modules[] | select(.name == "ES-DE") | .sources[0].url = strenv(NEW_URL)' cooker/net.retrodeck.retrodeck.yml
+      #     yq e -i '.modules[] | select(.name == "ES-DE") | .sources[0].sha256 = strenv(NEW_SHA256)' cooker/net.retrodeck.retrodeck.yml
+
+      # - name: Commit and push changes to Cooker repo
+      #   if: contains(env.BRANCH_NAME, 'feat/') == false
+      #   run: |
+      #     cd "${GITHUB_WORKSPACE}/cooker"
       #     git config user.name "GitHub Actions"
       #     git config user.email "actions@github.com"
-      #     git add * net.retrodeck.es-de.yml
+      #     git add net.retrodeck.retrodeck.yml
-      #     git commit -m '[AUTOMATED] Updating ES-DE after build [skip ci]'
+      #     git commit -m "ES-DE: updated module with new artifact URL and SHA256 [skip ci]"
-      #     git push origin main
+      #     git push origin HEAD
-      #   continue-on-error: true # TODO: would be good to update the manifest but it's broken
-
-      # - name: GitHub Commit & Push
-      #   uses: actions-js/push@v1.4
-      #   with: 
-      #     github_token: ${{ secrets.TRIGGER_BUILD_TOKEN }}
-      #     message: '[AUTOMATED] Updating ES-DE after build [skip ci]'
-      #     branch: retrodeck-main
-      #   continue-on-error: true # TODO: would be good to update the manifest but it's broken
-            
-
 

resources/systems/linux/es_find_rules.xml

@@ -810,6 +810,7 @@
             <entry>ruffle</entry>
         </rule>
         <rule type="staticpath">
+            <entry>/app/bin/ruffle-wrapper.sh</entry>   <!-- RetroDECK -->
             <entry>~/Applications/ruffle/ruffle</entry>
             <entry>~/.local/share/applications/ruffle/ruffle</entry>
             <entry>~/.local/bin/ruffle/ruffle</entry>

resources/systems/linux/es_systems.xml

@@ -686,18 +686,18 @@
         <platform>fds</platform>
         <theme>fds</theme>
     </system>
-<!--
+
     <system>
         <name>flash</name>
         <fullname>Adobe Flash</fullname>
         <path>%ROMPATH%/flash</path>
         <extension>.swf .SWF</extension>
-        <command label="Ruffle (Standalone)">%EMULATOR_RUFFLE% &ndash;&ndash;fullscreen %ROM%</command>
+        <command label="Ruffle (Standalone)">%EMULATOR_RUFFLE% %ROM%</command>
-        <command label="Lightspark (Standalone)">%EMULATOR_LIGHTSPARK% &ndash;&ndash;fullscreen %ROM%</command>
+        <!-- <command label="Lightspark (Standalone)">%EMULATOR_LIGHTSPARK% &ndash;&ndash;fullscreen %ROM%</command> -->
         <platform>flash</platform>
         <theme>flash</theme>
     </system>
--->
+
     <system>
         <name>fm7</name>
         <fullname>Fujitsu FM-7</fullname>