Merge branch 'cooker' into feat/cheevos

.github/workflows/cooker-selfhosted.yml

@@ -64,6 +64,9 @@ jobs:
       # if the branch is coming from a PR the tag should be manually built
       - name: "Generate version tag"
         run: |
+          source automation_tools/version_extractor.sh
+          MANIFEST_VERSION="$(fetch_manifest_version)"
+          echo "MANIFEST_VERSION=$MANIFEST_VERSION" >> $GITHUB_ENV
           if [[ "$BRANCH_NAME" == 'refs/'* ]]; then
             pr_number=$(echo ${{env.BRANCH_NAME}} | awk -F'/' '{print $3}')
             source_branch=$(curl -s "https://api.github.com/repos/XargonWan/RetroDECK/pulls/$pr_number" | jq -r '.head.ref')
@@ -71,9 +74,11 @@ jobs:
             echo "[DEBUG] source branch is: $source_branch"
             echo "TAG=PR-$pr_number-$source_branch-${{ env.buildid }}" >> $GITHUB_ENV
           else
-            echo "TAG=${{env.BRANCH_NAME}}-${{ env.buildid }}" >> $GITHUB_ENV
+            TAG="$MANIFEST_VERSION-${{ env.buildid }}"
+            echo "TAG=$TAG" >> $GITHUB_ENV
           fi
-          echo "Version TAG: ${{ env.TAG }}"
+          echo "MANIFEST_VERSION: $MANIFEST_VERSION"
+          echo "Version TAG: $TAG"
 
       # backing up manifest in case download fails and hashes must be recalculated
       - name: Manifest backup
@@ -159,6 +164,17 @@ jobs:
           repo: RetroDECK-cooker
         continue-on-error: true
 
+      - name: Rewrite Tag
+        run: |
+          git submodule deinit -f --all
+          git fetch --tags
+          if git rev-parse --verify "${{ env.TAG }}" >/dev/null 2>&1; then # if the tag exists
+              git tag -d "${{ env.TAG }}"                                  # remove it from local repo
+              git push --delete origin "${{ env.TAG }}"                    # and from remote
+          fi
+          git tag "${{ env.TAG }}"             # Create the tag locally               
+          git push origin "${{ env.TAG }}"     # Push the new tag in the remote repo
+
       # In case it cannot publish the release at least it's providing the flatpak file for creating a manual release
       - name: Upload RetroDECK-cooker.flatpak
         uses: actions/upload-artifact@v3

.github/workflows/main-selfhosted.yml

@@ -115,6 +115,17 @@ jobs:
           repo: RetroDECK
         continue-on-error: true
 
+      - name: Rewrite Tag
+        run: |
+          git submodule deinit -f --all
+          git fetch --tags
+          if git rev-parse --verify "${{ env.REL_VER }}" >/dev/null 2>&1; then # if the tag exists
+              git tag -d "${{ env.REL_VER }}"                                  # remove it from local repo
+              git push --delete origin "${{ env.REL_VER }}"                    # and from remote
+          fi
+          git tag "${{ env.REL_VER }}"             # Create the tag locally               
+          git push origin "${{ env.REL_VER }}"     # Push the new tag in the remote repo
+
       # In case it cannot publish the release at least it's providing the flatpak file for creating a manual release
       - name: Upload RetroDECK.flatpak
         uses: actions/upload-artifact@v3
@@ -166,6 +177,7 @@ jobs:
               -H "Content-Type: multipart/form-data" \
               -F "attachment=@RetroDECK-Artifact.tar.gz" \
               "http://$UPLOAD_HOST/api/v1/repos/$ORGANIZATION/$REPO/releases/$release_id/assets?name=RetroDECK-Artifact.tar.gz"
+        continue-on-error: true # this will be in place until we reate an artifacts website that bypasses cloudflare limit
 
       - name: Upload RetroDECK.flatpak.sha to Gitea Release
         run: |

automation_tools/main_version_checker.sh

@@ -42,8 +42,8 @@ appdata_version=$(fetch_appdata_version)
 echo -e "Appdata:\t\t$appdata_version"
 
 # Additional checks
-if [[ "$manifest_version" == "main" || "$manifest_version" == "THISBRANCH" ]]; then
+if [[ "$manifest_version" == "main" || "$manifest_version" == "THISBRANCH" || "$manifest_version" == *"cooker"* ]]; then
-    echo "Manifest version cannot be 'main' or 'THISBRANCH'. Please fix it."
+    echo "Manifest version cannot be 'main', 'THISBRANCH', or contain 'cooker'. Please fix it."
     exit 1
 fi
 

automation_tools/version_extractor.sh

@@ -32,3 +32,5 @@ fetch_manifest_version(){
     manifest_version=$(echo "$manifest_version" | awk '{$1=$1;print}')
     echo "$manifest_version"
 }
+
+echo "Version extractor functions loaded"

emu-configs/defaults/dolphin/Dolphin.ini

@@ -51,10 +51,17 @@ Threads = True
 ISOPath0 =
 ISOPath1 =
 ISOPaths = 2
-WiiSDCardPath =
 WirelessMac =
 HotkeysRequireFocus = True
 RecursiveISOPaths = False
+NANDRootPath =
+DumpPath = /var/data/dolphin-emu/Dump/
+LoadPath = /var/data/dolphin-emu/Load/
+NANDRootPath = /var/data/dolphin-emu/Wii/
+ResourcePackPath = /var/data/dolphin-emu/ResourcePacks/
+WFSPath =
+WiiSDCardPath =
+WiiSDCardSyncFolder = /var/data/dolphin-emu/Load/WiiSDSync/
 [Interface]
 ConfirmStop = True
 CursorVisibility = 0
@@ -63,6 +70,14 @@ PauseOnFocusLost = False
 ShowActiveTitle = True
 UseBuiltinTitleDatabase = True
 UsePanicHandlers = True
+[NetPlay]
+TraversalChoice = direct
+[Core]
+SelectedLanguage = 0
+SerialPort1 = 255
+SkipIPL = True
+SlotA = 8
+SlotB = 255
 [BluetoothPassthrough]
 Enabled = False
 [DSP]
@@ -77,4 +92,4 @@ SavesInRomPath = False
 SavesPath =
 Threads = True
 [Input]
-BackgroundInput = False
+BackgroundInput = False

emu-configs/dolphin/Dolphin.ini

@@ -42,12 +42,17 @@ Threads = True
 [General]
 ISOPath0 = RETRODECKHOMEDIR/roms/wii
 ISOPath1 = RETRODECKHOMEDIR/roms/gc
-ISOPaths = 3
+ISOPaths = 2
 WiiSDCardPath = RETRODECKHOMEDIR/saves/wii/dolphin/sd.raw
 WirelessMac = 00:17:ab:83:9b:d4
 HotkeysRequireFocus = True
 RecursiveISOPaths = True
-ISOPath2 = RETRODECKHOMEDIR/roms/wii
+DumpPath = /var/data/dolphin-emu/Dump/
+LoadPath = /var/data/dolphin-emu/Load/
+NANDRootPath = /var/data/dolphin-emu/Wii/
+ResourcePackPath = /var/data/dolphin-emu/ResourcePacks/
+WFSPath =
+WiiSDCardSyncFolder = /var/data/dolphin-emu/Load/WiiSDSync/
 [NetPlay]
 TraversalChoice = direct
 [BluetoothPassthrough]

net.retrodeck.retrodeck.appdata.xml

@@ -67,7 +67,7 @@
    <project_license>GPL-3.0</project_license>
    <metadata_license>CC0-1.0</metadata_license>
    <releases>
-      <release version="0.8.2b" date="2024-07-16">
+      <release version="0.8.2b" date="2024-07-17">
          <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.8.2b</url>
          <description>
             <p>Changes:</p>

net.retrodeck.retrodeck.yml

@@ -77,8 +77,8 @@ modules:
       - |
 
         # on main please update this with the version variable, eg: VERSION=0.8.0b
-        # on cooker will be THISBRANCH
+        # on cooker will be VERSION=cooker-0.9.0b for example
-        VERSION=THISBRANCH
+        VERSION=cooker-0.8.2b
 
         git checkout ${GITHUB_REF_NAME}
         mkdir -p ${FLATPAK_DEST}/retrodeck/
@@ -716,7 +716,7 @@ modules:
         # fatal: remote transport reported error
         # url: ssh://git@github.com/dolphin-emu/dolphin.git
         url: https://github.com/dolphin-emu/dolphin.git
-        commit: 505fe5cc0e3123746e673ecca77c04ec72ff106f
+        commit: cc3ff347b437fd80f3a2880d1bbc7ba2d5f191f4
         # x-checker-data:
         #   type: json
         #   url: https://dolphin-emu.org/update/latest/beta