From d6715273c16bd7e494d1c02af5778f858360b0d7 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Tue, 19 Oct 2021 14:33:01 +0200
Subject: [PATCH] Test with git commands only

---
 .github/workflows/Tasmota_build_devel.yml | 24 +++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/Tasmota_build_devel.yml b/.github/workflows/Tasmota_build_devel.yml
index bbcd6d226..f5d78bb4e 100644
--- a/.github/workflows/Tasmota_build_devel.yml
+++ b/.github/workflows/Tasmota_build_devel.yml
@@ -1324,6 +1324,8 @@ jobs:
     runs-on: ubuntu-latest
     continue-on-error: true
     steps:
+    - uses: actions/checkout@v2
+    - name: Download artifacts
     - uses: actions/download-artifact@v2
       with:
         name: firmware
@@ -1362,18 +1364,16 @@ jobs:
       run: ls -R ./*
 
     - name: Push Firmware files to https://github.com/arendst/Tasmota-firmware
-      uses: andstor/copycat-action@v3
-      with:
-        personal_token: ${{ secrets.API_TOKEN_GITHUB }}
-        src_path: firmware/.
-        src_branch: development
-        dst_path: /firmware/
-        dst_owner: arendst
-        dst_branch: main
-        dst_repo_name: Tasmota-firmware
-        username: github-actions
-        email: github-actions@github.com
-        commit_message: ${GITHUB_SHA}
+      run: |
+        git config user.name "Platformio BUILD"
+        git config user.email github-actions@github.com
+        git switch -c work
+        git remote add -f Tasmota "https://github.com/arendst/Tasmota-firmware.git" --track main
+        git rm -r --cached .
+        git add -f ./firmware/*
+        git commit -m ${GITHUB_SHA}
+        git merge Tasmota-firmware/main --allow-unrelated-histories
+        git push -u origin main
 
     - name: Creat trigger.txt
       run: |