From 0c36bcb25c9f63fff3166b909e7f1d3a28c4be9c Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Wed, 23 Dec 2020 15:23:57 +0100
Subject: [PATCH] Build firmware from Master branch

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

diff --git a/.github/workflows/Tasmota_build.yml b/.github/workflows/Tasmota_build.yml
index 7f6d09b99..0b2ac9ef2 100644
--- a/.github/workflows/Tasmota_build.yml
+++ b/.github/workflows/Tasmota_build.yml
@@ -2,7 +2,7 @@ name: Build_firmware
 
 on:
   push:
-    branches: development
+    branches: master
 
 jobs:
   tasmota_pull:
@@ -13,14 +13,14 @@ jobs:
     - name: Use latest Tasmota development
       run: | 
         git config --local user.name "Platformio BUILD"
-        git switch -c master
+        git switch -c work
         git remote add -f Tasmota "https://github.com/arendst/Tasmota.git"
-        git merge Tasmota/development --allow-unrelated-histories          
-    - name: Push Tasmota   # Push updates of latest Tasmota development to repo
+        git merge Tasmota/master --allow-unrelated-histories          
+    - name: Push Tasmota   # Push updates of latest Tasmota master to repo
       uses: ad-m/github-push-action@master
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}
-        branch: 'development'
+        branch: 'master'
         force: true
 
 
@@ -1544,5 +1544,5 @@ jobs:
       uses: ad-m/github-push-action@master
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}
-        branch: 'firmware'
+        branch: 'release-firmware'
         force: true