From a8e5d326f983849d552dd10aeca5e1e0c618758a Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Mon, 3 Feb 2025 11:18:23 +0900
Subject: [PATCH] WORKFLOW: changing push action - fix3 [skip ci]

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

diff --git a/.github/workflows/flathub_push_main.yml b/.github/workflows/flathub_push_main.yml
index 02bf7cc2..cad3fbf9 100644
--- a/.github/workflows/flathub_push_main.yml
+++ b/.github/workflows/flathub_push_main.yml
@@ -23,15 +23,10 @@ jobs:
           GIT_MAIL: ${{ secrets.GITMAIL }}
 
       - name: Commit and push changes
-        uses: EndBug/add-and-commit@v9
+        uses: ad-m/github-push-action@master
         with:
-          message: "Updated flathub/net.retrodeck.retrodeck to v${{ env.RELNAME }} from RetroDECK/${{ env.RD_BRANCH }}"
-          new_branch: "${{ env.RELNAME }}"
-          cwd: "${{ env.FOLDER_TO_PUSH }}"
-          push: 'origin ${{ env.TARGET_REPO }} --set-upstream --force'
-          author_email: ${{ secrets.GITMAIL }}
-          committer_email: ${{ secrets.GITNAME }}
-          add: "*"
-          tag: "v${{ env.RELNAME }} --force"
-          default_author: "Rekku"
-          committer_name: "Rekku"
\ No newline at end of file
+          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
diff --git a/automation_tools/flathub_push_main.sh b/automation_tools/flathub_push_main.sh
index 89d03f4e..6732f5c0 100755
--- a/automation_tools/flathub_push_main.sh
+++ b/automation_tools/flathub_push_main.sh
@@ -88,8 +88,11 @@ if [ -n "${GITHUB_WORKFLOW}" ]; then
     echo "RELNAME=$relname" >> $GITHUB_ENV
     echo "FOLDER_TO_PUSH="$gits_folder/flathub"" >> $GITHUB_ENV
     echo "TARGET_REPO=https://github.com/${flathub_target_repo}" >> $GITHUB_ENV
-else
-    git add .
-    git commit -m "Updated flathub/net.retrodeck.retrodeck to v$relname from RetroDECK/$rd_branch"
+fi
+
+git add .
+git commit -m "Updated flathub/net.retrodeck.retrodeck to v$relname from RetroDECK/$rd_branch"
+
+if [ -n "${GITHUB_WORKFLOW}" ]; then
     git push --force "https://github.com/${flathub_target_repo}.git" "$relname"
-fi
\ No newline at end of file
+fi