jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-27 12:46:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pre-release-9.2.0'

Browse Source
This commit is contained in:
Theo Arends 2020-12-23 18:31:24 +01:00
commit fa0e8867af
2 changed files with 1650 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/Tasmota_build.yml vendored
View File

@ -13,7 +13,7 @@ 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
@ -1531,6 +1531,8 @@ jobs:
[ ! -f ./mv_firmware/tasmota32-knx.* ] || mv ./mv_firmware/tasmota32-knx.* ./firmware/tasmota32/
[ ! -f ./mv_firmware/tasmota32* ] || mv ./mv_firmware/tasmota32* ./firmware/tasmota32/languages/
[ ! -f ./mv_firmware/* ] || mv ./mv_firmware/* ./firmware/tasmota/languages/
rm ./firmware/tasmota32/*.gz
rm ./firmware/tasmota32/languages/*.gz
[ ! -f ./tools/Esptool/ESP32/*.* ] || mv ./tools/Esptool/ESP32/*.* ./firmware/tasmota32/ESP32_needed_files/
[ ! -f ./FIRMWARE.md ] || mv -f ./FIRMWARE.md ./README.md
- name: Commit files # transfer the new binaries back into the repository

1550
.github/workflows/Tasmota_build_master.yml vendored Normal file
View File

File diff suppressed because it is too large Load Diff