Getting red of main-experimental as other files are allowed on flathub

.github/workflows/main-experimental.yml

@@ -1,71 +0,0 @@
-# Due to the changes to the build systems actually on the branch integrated, this script will fail on main until merged
-
-name: main-experimental
-
-# Controls when the workflow will run
-on:
-  # Triggers the workflow on push or pull request events but only for the main branch
-  push:
-    branches: 
-      - main
-  pull_request:
-    branches:
-      - main
-
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
-jobs:
-  # This workflow contains a single job called "build"
-  build_main:
-    # The type of runner that the job will run on
-    runs-on: ubuntu-latest
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
-    steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
-
-      - name: Prepearing enviornment
-        run: |
-          #git submodule init
-          #git submodule update
-          sudo add-apt-repository ppa:alexlarsson/flatpak
-          sudo apt-get update
-          sudo apt install flatpak flatpak-builder p7zip-full
-          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
-      
-      # Doing everything in a clean dir to simulate the flathub enviro
-      - name: Building flatpak
-        run: |
-          mkdir clean
-          cp com.xargon.retrodeck.yml clean/com.xargon.retrodeck.yml
-          cd clean
-          sudo flatpak-builder --user --install --force-clean retrodeck-flatpak com.xargon.retrodeck.yml
-          sudo flatpak-builder --repo=local --force-clean localrepo com.xargon.retrodeck.yml
-          sudo flatpak build-bundle local RetroDECK.flatpak com.xargon.retrodeck
-
-      - name: Get date for artifacts
-        id: date
-        run: echo "::set-output name=date::$(date +'%Y%m%d_%H%M')"
-
-      - name: Publish the flatpak in a new cooker release
-        uses: ncipollo/release-action@v1
-        with:
-          tag: "${{ steps.date.outputs.date }}"
-          body: |
-            # Release Notes
-            
-            Changelog:
-            - 
-            - 
-            -
-
-          artifacts: "RetroDECK.flatpak"
-          allowUpdates: true
-          prerelease: true
-          draft: true
-          token: ${{ secrets.TRIGGER_BUILD_TOKEN }}
-          repo: RetroDECK

com.xargon.retrodeck.yml

@@ -8,9 +8,6 @@ base-version: 5.15-21.08
 # /Needed for Yuzu
 command: retrodeck.sh
 
-# WORKING ON RetroDECK branch:
-# 9d8b5ad985c5b29980810fdf05e1a534d2070ce2
-
 finish-args:
    - --socket=x11
    - --socket=wayland
@@ -19,7 +16,7 @@ finish-args:
    - --share=network
    - --device=all
    - --filesystem=~/retrodeck:create
-   - --filesystem=/run/media
+   - --filesystem=/run/media/mmcblk0p1
    - --allow=multiarch
    - --talk-name=org.freedesktop.ScreenSaver
    - --talk-name=org.freedesktop.PowerManagement.Inhibit
@@ -206,9 +203,6 @@ modules:
     make-args:
       - GLOBAL_CONFIG_DIR=${FLATPAK_DEST}/etc
     sources:
-      - type: git
-        url: https://github.com/XargonWan/RetroDECK.git
-        branch: 9d8b5ad985c5b29980810fdf05e1a534d2070ce2
       - type: git
         url: https://github.com/libretro/RetroArch.git
         branch: de4e56ecf28a09057734f8624af6d62f3088734f
@@ -484,9 +478,6 @@ modules:
         sed 's/yuzu/org.yuzu_emu.yuzu/g' -i
         /app/share/mime/packages/org.yuzu_emu.yuzu.xml
     sources:
-      - type: git
-        url: https://github.com/XargonWan/RetroDECK.git
-        branch: 9d8b5ad985c5b29980810fdf05e1a534d2070ce2
       - type: git
         url: https://github.com/yuzu-emu/yuzu-mainline.git
         tag: mainline-0-969
@@ -627,9 +618,6 @@ modules:
         install -Dm644 ../net.pcsx2.PCSX2.metainfo.xml
         /app/share/metainfo/net.pcsx2.PCSX2.metainfo.xml
     sources:
-      - type: git
-        url: https://github.com/XargonWan/RetroDECK.git
-        branch: 9d8b5ad985c5b29980810fdf05e1a534d2070ce2
       - type: git
         url: https://github.com/PCSX2/pcsx2.git
         tag: v1.7.2554
@@ -672,19 +660,14 @@ modules:
 
         # Logo, res
         - rm -f /app/share/emulationstation/resources/graphics/splash.svg
-        #- cp splash.svg /app/share/emulationstation/resources/graphics/splash.svg
+        - cp splash.svg /app/share/emulationstation/resources/graphics/splash.svg
-        - cp res/splash.svg /app/share/emulationstation/resources/graphics/splash.svg
+        - cp icon.svg /app/share/icons/hicolor/scalable/apps/com.xargon.retrodeck.svg
-        #- cp icon.svg /app/share/icons/hicolor/scalable/apps/com.xargon.retrodeck.svg
-        - cp res/icon.svg /app/share/icons/hicolor/scalable/apps/com.xargon.retrodeck.svg
 
         # Tools
         - mkdir -p ${FLATPAK_DEST}/retrodeck/tools/
-        #- cp start-retroarch.sh ${FLATPAK_DEST}/retrodeck/tools/
+        - cp start-retroarch.sh ${FLATPAK_DEST}/retrodeck/tools/
-        #- cp move-roms.sh ${FLATPAK_DEST}/retrodeck/tools/
+        - cp move-roms.sh ${FLATPAK_DEST}/retrodeck/tools/
-        - cp tools/start-retroarch.sh ${FLATPAK_DEST}/retrodeck/tools/
-        - cp tools/move-roms.sh ${FLATPAK_DEST}/retrodeck/tools/
         - cp tools-gamelist.xml ${FLATPAK_DEST}/retrodeck/
-
         
         - cp retrodeck.sh /app/bin/retrodeck.sh
         - chmod +x /app/bin/retrodeck.sh
@@ -694,24 +677,21 @@ modules:
 
     #cleanup: ['*']
     sources:
-      - type: git
+      - type: file
-        url: https://github.com/XargonWan/RetroDECK.git
+        path: es_find_rules.xml
-        branch: 9d8b5ad985c5b29980810fdf05e1a534d2070ce2
+      - type: file
-      #- type: file
+        path: es_settings.xml
-      #  path: es_find_rules.xml
+      - type: file
-      #- type: file
+        path: es_systems.xml
-      #  path: es_settings.xml
+      - type: file
-      #- type: file
+        path: retrodeck.sh
-      #  path: es_systems.xml
+      - type: file
-      #- type: file
+        path: retrodeck-retroarch.cfg
-      #  path: retrodeck.sh
+      - type: file
-      #- type: file
+        path: tools-gamelist.xml
-      #  path: retrodeck-retroarch.cfg
+      - type: dir
-      #- type: file
+        path: res
-      #  path: tools-gamelist.xml
+      - type: dir
-      #- type: dir
+        path: tools
-      #  path: res
+      - type: file
-      #- type: dir
+        path: desktop_entry
-      #  path: tools
-      #- type: file
-      #  path: desktop_entry