Revert "Build firmware from Master branch"

This commit is contained in:
Jason2866 2020-12-23 15:57:37 +01:00 committed by GitHub
parent e1d44b9dfa
commit 39f31d8cdf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2,7 +2,7 @@ name: Build_firmware
on: on:
push: push:
branches: master branches: development
jobs: jobs:
tasmota_pull: tasmota_pull:
@ -13,14 +13,14 @@ jobs:
- name: Use latest Tasmota development - name: Use latest Tasmota development
run: | run: |
git config --local user.name "Platformio BUILD" 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 remote add -f Tasmota "https://github.com/arendst/Tasmota.git"
git merge Tasmota/master --allow-unrelated-histories git merge Tasmota/development --allow-unrelated-histories
- name: Push Tasmota # Push updates of latest Tasmota master to repo - name: Push Tasmota # Push updates of latest Tasmota development to repo
uses: ad-m/github-push-action@master uses: ad-m/github-push-action@master
with: with:
github_token: ${{ secrets.GITHUB_TOKEN }} github_token: ${{ secrets.GITHUB_TOKEN }}
branch: 'master' branch: 'development'
force: true force: true
@ -1544,5 +1544,5 @@ jobs:
uses: ad-m/github-push-action@master uses: ad-m/github-push-action@master
with: with:
github_token: ${{ secrets.GITHUB_TOKEN }} github_token: ${{ secrets.GITHUB_TOKEN }}
branch: 'release-firmware' branch: 'firmware'
force: true force: true