From 0767c69ec312ba5d6cfe59d1cfcebffb047c7212 Mon Sep 17 00:00:00 2001
From: XargonWan <xargonwan@gmail.com>
Date: Mon, 18 Dec 2023 09:06:44 +0100
Subject: [PATCH] Fixed wrong merge

---
 .github/workflows/main-selfhosted.yml | 11 +++--------
 net.retrodeck.retrodeck.appdata.xml   |  2 +-
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/main-selfhosted.yml b/.github/workflows/main-selfhosted.yml
index b30cb9aa..0cb68026 100644
--- a/.github/workflows/main-selfhosted.yml
+++ b/.github/workflows/main-selfhosted.yml
@@ -40,10 +40,6 @@ jobs:
       - name: "Install dependencies"
         run: "automation_tools/install_dependencies.sh"
 
-      # backing up manifest in case download fails and hashes must be recalculated
-      - name: Manifest backup
-        run: "cp ${GITHUB_WORKSPACE}/net.retrodeck.retrodeck.yml ${GITHUB_WORKSPACE}/net.retrodeck.retrodeck.yml.bak"
-
       - name: Run pre-build automation tasks
         run : "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh"
 
@@ -75,11 +71,10 @@ jobs:
         if: steps.flatpak-download.outcome == 'failure'
         run: |
           echo "Download failed, maybe some hash changed since the build start."
+          git checkout -- net.retrodeck.retrodeck.yml
           echo "Recalculating hashes and retrying download..."
-          rm -f "{GITHUB_WORKSPACE}/net.retrodeck.retrodeck.yml"
-          cp "${GITHUB_WORKSPACE}/net.retrodeck.retrodeck.yml.bak" "${GITHUB_WORKSPACE}/net.retrodeck.retrodeck.yml"
-          "${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh"
-          "${GITHUB_WORKSPACE}/automation_tools/flatpak_build_download_only.sh"
+          "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh"
+          "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/flatpak_build_download_only.sh"
 
       - name: Build flatpak
         run: "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/flatpak_build_only.sh"
diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml
index b2d3a365..543b1113 100644
--- a/net.retrodeck.retrodeck.appdata.xml
+++ b/net.retrodeck.retrodeck.appdata.xml
@@ -65,7 +65,7 @@
    <project_license>GPL-3.0</project_license>
    <metadata_license>CC0-1.0</metadata_license>
    <releases>
-      <release version="0.7.5b" date="2023-14-12">
+      <release version="0.7.5b" date="2023-12-14">
          <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.7.5b</url>
          <description>
             <p>Bug fixes and other changes:</p>