From 4f977e3501b3617b4b25e2e77ee3112901257115 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Mon, 3 Feb 2025 10:48:31 +0900
Subject: [PATCH] WORKFLOW: added proper push step if in gtihub runner - fix2
 [skip ci]

---
 .github/workflows/flathub_push_main.yml | 6 ++++--
 automation_tools/flathub_push_main.sh   | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/flathub_push_main.yml b/.github/workflows/flathub_push_main.yml
index 4c54c2d1..9a8765c6 100644
--- a/.github/workflows/flathub_push_main.yml
+++ b/.github/workflows/flathub_push_main.yml
@@ -27,7 +27,9 @@ jobs:
         with:
           commit_message: "Updated flathub/net.retrodeck.retrodeck to v${{ env.RELNAME }} from RetroDECK/${{ env.RD_BRANCH }}"
           branch: "${{ env.RD_BRANCH }}"
-          repository: "${{ secrets.GITHUB_REPOSITORY }}"
+          repository: "${{ env.TARGET_REPO }}"
           push_options: '--force'
           commit_user_email: ${{ secrets.GITMAIL }}
-          token: ${{ secrets.GITHUB_TOKEN }}
+          commit_user_name: ${{ secrets.GITNAME }}
+          create_branch: true
+          file_pattern: "${{ env.FOLDER_TO_PUSH }}/*"
diff --git a/automation_tools/flathub_push_main.sh b/automation_tools/flathub_push_main.sh
index 8cb20142..9d050b20 100755
--- a/automation_tools/flathub_push_main.sh
+++ b/automation_tools/flathub_push_main.sh
@@ -82,6 +82,8 @@ fi
 if [ -n "${GITHUB_WORKFLOW}" ]; then
     echo "RD_BRANCH=$rd_branch" >> $GITHUB_ENV
     echo "RELNAME=$relname" >> $GITHUB_ENV
+    echo "FOLDER_TO_PUSH="$gits_folder/flathub"" >> $GITHUB_ENV
+    echo "TARGET_REPO=https://github.com/${flathub_target_repo}.git" >> $GITHUB_ENV
 else
     git add .
     git commit -m "Updated flathub/net.retrodeck.retrodeck to v$relname from RetroDECK/$rd_branch"