From 166b43485bf3cee0dd91794d45b8bc3fac240601 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Mon, 3 Feb 2025 12:03:45 +0900
Subject: [PATCH] WORKFLOW: changing to a third push action [skip ci]

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

diff --git a/.github/workflows/flathub_push_main.yml b/.github/workflows/flathub_push_main.yml
index cad3fbf9..4b7b816f 100644
--- a/.github/workflows/flathub_push_main.yml
+++ b/.github/workflows/flathub_push_main.yml
@@ -23,10 +23,13 @@ jobs:
           GIT_MAIL: ${{ secrets.GITMAIL }}
 
       - name: Commit and push changes
-        uses: ad-m/github-push-action@master
+        uses: appleboy/git-push-action@v1.0.0
         with:
+          commit_message: "Update RetroDECK to v${{ env.RELNAME }} from RetroDECK/${{ env.RD_BRANCH }}"
           branch: "${{ env.RELNAME }}"
-          directory: "${{ env.FOLDER_TO_PUSH }}"
-          repository: "${{ env.TARGET_REPO }}"
-          tags: "v${{ env.RELNAME }} --force"
-          force: true
\ No newline at end of file
+          path: "${{ env.FOLDER_TO_PUSH }}"
+          remote: "${{ env.TARGET_REPO }}"
+          tag: "v${{ env.RELNAME }} --force"
+          force: true
+          author_name: ${{ env.GIT_NAME }}
+          author_email: ${{ env.GIT_MAIL }}
\ No newline at end of file
diff --git a/automation_tools/flathub_push_main.sh b/automation_tools/flathub_push_main.sh
index cb589641..594586ad 100755
--- a/automation_tools/flathub_push_main.sh
+++ b/automation_tools/flathub_push_main.sh
@@ -91,13 +91,9 @@ 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=${flathub_target_repo}" >> $GITHUB_ENV
-fi
-
-git add .
-git commit -m "Updated flathub/net.retrodeck.retrodeck to v$relname from RetroDECK/$rd_branch"
-
-if [ -n "${GITHUB_WORKFLOW}" ]; then
+    echo "TARGET_REPO=https://github.com/${flathub_target_repo}" >> $GITHUB_ENV
+else 
+    git add .
+    git commit -m "Update RetroDECK to v$relname from RetroDECK/$rd_branch"
     git push --force "https://github.com/${flathub_target_repo}" "$relname"
-    rm ~/.git-credentials
 fi