From 55b629fce23ac535c31a057f4b0027ecfe60dafa Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Mon, 3 Feb 2025 13:30:05 +0900
Subject: [PATCH] WORKFLOW: trying again without the push job [skip ci]

---
 .github/workflows/flathub_push_main.yml | 24 +++++++++++++-----------
 automation_tools/flathub_push_main.sh   | 25 ++++++++++++++-----------
 2 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/flathub_push_main.yml b/.github/workflows/flathub_push_main.yml
index 4b7b816f..b1e3bf9c 100644
--- a/.github/workflows/flathub_push_main.yml
+++ b/.github/workflows/flathub_push_main.yml
@@ -21,15 +21,17 @@ jobs:
         env:
           GIT_NAME: ${{ secrets.GITNAME }}
           GIT_MAIL: ${{ secrets.GITMAIL }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Commit and push changes
-        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 }}"
-          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
+      # - name: Commit and push changes
+      #   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 }}"
+      #     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 }}
+      #     commit: true
\ No newline at end of file
diff --git a/automation_tools/flathub_push_main.sh b/automation_tools/flathub_push_main.sh
index 594586ad..311c021e 100755
--- a/automation_tools/flathub_push_main.sh
+++ b/automation_tools/flathub_push_main.sh
@@ -75,11 +75,20 @@ cat << EOF >> flathub.json
 }
 EOF
 
+# If we are in a GitHub workflow...
 if [ -n "${GITHUB_WORKFLOW}" ]; then
     git config --local user.name "$GIT_NAME"
     git config --local user.email "$GIT_MAIL"
     git config --local credential.helper store
-    echo "https://${GIT_NAME}:${GITHUB_TOKEN}@github.com" > ~/.git-credentials
+
+    GITHUB_TOKEN="${GITHUB_TOKEN}@" #we add this in order to inject the @ to correctly populate tue git url
+
+    # echo "https://${GIT_NAME}:${GITHUB_TOKEN}@github.com" > ~/.git-credentials
+    # 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}" >> $GITHUB_ENV
+
 elif [[ -z $(git config --get user.name) || -z $(git config --get user.email) ]]; then
     read -p "No git user.name set, please enter your name: " git_username
     git config --local user.name "$git_username"
@@ -87,13 +96,7 @@ elif [[ -z $(git config --get user.name) || -z $(git config --get user.email) ]]
     git config --local user.email "$git_email"
 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}" >> $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"
-fi
+git add .
+git commit -m "Update RetroDECK to v$relname from RetroDECK/$rd_branch"
+git push --force "https://{$GITHUB_TOKEN}github.com/${flathub_target_repo}" "$relname"
+