From 39f31d8cdfc3f5e7b6f9770ca95eabdd24361a0f Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Wed, 23 Dec 2020 15:57:37 +0100 Subject: [PATCH] Revert "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 0b2ac9ef2..7f6d09b99 100644 --- a/.github/workflows/Tasmota_build.yml +++ b/.github/workflows/Tasmota_build.yml @@ -2,7 +2,7 @@ name: Build_firmware on: push: - branches: master + branches: development jobs: tasmota_pull: @@ -13,14 +13,14 @@ jobs: - name: Use latest Tasmota development run: | git config --local user.name "Platformio BUILD" - git switch -c work + git switch -c master git remote add -f Tasmota "https://github.com/arendst/Tasmota.git" - git merge Tasmota/master --allow-unrelated-histories - - name: Push Tasmota # Push updates of latest Tasmota master to repo + git merge Tasmota/development --allow-unrelated-histories + - name: Push Tasmota # Push updates of latest Tasmota development to repo uses: ad-m/github-push-action@master with: github_token: ${{ secrets.GITHUB_TOKEN }} - branch: 'master' + branch: 'development' force: true @@ -1544,5 +1544,5 @@ jobs: uses: ad-m/github-push-action@master with: github_token: ${{ secrets.GITHUB_TOKEN }} - branch: 'release-firmware' + branch: 'firmware' force: true