CI and flatpak updates from other branches

Author: Motobug

.github/workflows/ci.yml

@@ -24,7 +24,7 @@ jobs:
     - name: Upload Build Artifact
       uses: actions/upload-artifact@v4
       with:
-        name: Project-Plus-Dolphin-windows-x86_64
+        name: Project-Plus-Dolphin-Windows-${{ env.DOLPHINVER }}
         path: Binary/x64/
 
   build_macos:
@@ -151,14 +151,14 @@ jobs:
           ninja project-plus-dolphin
           ccache -s
 
-      - name: Build Dolphin (arm64)
-        working-directory: build-arm
-        run: |
-          ccache -p
-          ccache -s
-          ccache -z
-          ninja project-plus-dolphin
-          ccache -s
+      #- name: Build Dolphin (arm64)
+      #  working-directory: build-arm
+      #  run: |
+      #    ccache -p
+      #    ccache -s
+      #    ccache -z
+      #    ninja project-plus-dolphin
+      #    ccache -s 
 
       - name: Prepare Build Artifacts
         id: create-artifact
@@ -180,7 +180,7 @@ jobs:
           else
             SUFFIX="sha[$(git rev-parse --short HEAD)]"
           fi
-          APPNAME="ProjectPlus-$SUFFIX"
+          APPNAME="Project-Plus-Dolphin-macOS-$SUFFIX"
           mv build/Binaries/DolphinQt.app "$APPNAME.app"
           tar --options xz:compression-level=9 -cvJf "$APPNAME.tar.xz" "$APPNAME.app"
           echo "name=$APPNAME" >> "$GITHUB_OUTPUT"
@@ -339,7 +339,7 @@ jobs:
     - name: Upload Static Build
       uses: actions/upload-artifact@v4
       with:
-        name: Project-Plus-Dolphin_${{ env.DOLPHINVER }}
+        name: Project-Plus-Dolphin-AppImage-${{ env.DOLPHINVER }}
         path: uploads/
       env:
         DEFAULT_BRANCH: git-actions

Distribution/flatpak/flatpak.yml

@@ -1,5 +1,5 @@
 app-id: org.projectplusgame.project-plus-dolphin
-branch: dolphin-emu-release-prep-2509
+branch: master
 runtime: org.kde.Platform
 runtime-version: 6.6
 sdk: org.kde.Sdk
@@ -109,9 +109,10 @@ modules:
       - /share/man
     sources:
       - type: git
-        url: https://github.com/Project-Plus-Development-Team/Project-Plus-Dolphin/tree/dolphin-emu-release-prep-2509
-        ref: dolphin-emu-release-prep-2509
-
+        url: https://github.com/Project-Plus-Development-Team/Project-Plus-Dolphin.git
+        #tag: v3.1.2-mainline-beta.5  													#uncomment and update these two lines to build a specific commit
+        #commit: 94774054cb930b6cb2b39556c24fd462ec998553
+        
       # TODO: Add x-checker-data
       # Project Plus SD card
       #- type: file
@@ -127,10 +128,10 @@ modules:
 
       # TODO: Add x-checker-data
       # Project Plus ModPack that contains HD textures
-      - type: archive
-        url: https://github.com/jlambert360/PPlusReleases/releases/download/v3.1.2/Project+.v3.1.2.Modders.Pack.zip
-        sha256: 291549549a88617f8f72cf549023da9af154493b75da7a8192245ed98c101ba3                                    # This is the hash of the zip file not the uncompressed
-        dest: ModPack
+      #- type: archive
+      # url: https://github.com/jlambert360/PPlusReleases/releases/download/v3.1.2/Project+.v3.1.2.Modders.Pack.zip
+      #  sha256: 291549549a88617f8f72cf549023da9af154493b75da7a8192245ed98c101ba3                                    # This is the hash of the zip file not the uncompressed
+      #  dest: ModPack
 
       # Script that is ran everytime the final Flatpak starts
       - type: file
@@ -163,8 +164,8 @@ modules:
         /app/share/applications/project-plus-dolphin.desktop
       - rm -r ${FLATPAK_DEST}/share/project-plus-dolphin/sys                                                                                       # Remove preinstalled sys directory
       - mv Data/Sys ${FLATPAK_DEST}/share/project-plus-dolphin/sys/                                                                                # Move Sys directory to correct location (only use without the -DLINUX_LOCAL_DEV=true flag set
-      #- tar --transform="s|sd.raw|WiiSD.raw|" -xf sd.tar.gz -C ${FLATPAK_DEST}/share/project-plus-dolphin/sys/Load/                               # Extract, rename and move SD card to correct location
-      - mv Launcher ${FLATPAK_DEST}/share/project-plus-dolphin/sys/Wii/                                                                            # Move Launcher directory to correct location
-      - mkdir -p ${FLATPAK_DEST}/share/project-plus-dolphin/sys/Load/Textures                                                                      # Make directory for HD textures
-      - mv "ModPack/Full Quality HD Textures" ${FLATPAK_DEST}/share/project-plus-dolphin/sys/Load/Textures/RSBE01/                              	  # Move HD Textures from ModPack to correct location
+      #- tar --transform="s|sd.raw|WiiSD.raw|" -xf sd.tar.gz -C ${FLATPAK_DEST}/share/project-plus-dolphin/user/Wii/                               # Extract, rename and move SD card to correct location
+      #- mv Launcher ${FLATPAK_DEST}/share/project-plus-dolphin/sys/Wii/                                                                            # Move Launcher directory to correct location
+      #- mkdir -p ${FLATPAK_DEST}/share/project-plus-dolphin/sys/Load/Textures                                                                      # Make directory for HD textures
+      #- mv "ModPack/Full Quality HD Textures" ${FLATPAK_DEST}/share/project-plus-dolphin/sys/Load/Textures/RSBE01/                              	  # Move HD Textures from ModPack to correct location
       - install -Dm644 org.projectplusgame.project-plus-dolphin.metainfo.xml -t ${FLATPAK_DEST}/share/metainfo/                                    # Install metainfo file