Skip to content

Commit

Permalink
Merge pull request #1 from arendst/development
Browse files Browse the repository at this point in the history
Updating Fork
  • Loading branch information
crispy78 committed Jan 11, 2021
2 parents f2b5eb1 + 4e5e3d4 commit a963788
Show file tree
Hide file tree
Showing 2,051 changed files with 42,071 additions and 19,165 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
**Related issue (if applicable):** fixes #<Tasmota issue number goes here>

## Checklist:
- [ ] The pull request is done against the latest dev branch
- [ ] The pull request is done against the latest development branch
- [ ] Only relevant files were touched
- [ ] Only one feature/fix was added per PR and the code change compiles without warnings
- [ ] The code change is tested and works on Tasmota core ESP8266 V.2.7.4.9
Expand Down
39 changes: 29 additions & 10 deletions .github/workflows/CI_github.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Tasmota CI

on:
on:
pull_request:

jobs:
Expand All @@ -16,7 +16,7 @@ jobs:
pip install -U platformio
platformio upgrade --dev
platformio update
- name: Run PlatformIO
- name: Run PlatformIO
run: platformio run -e tasmota
- uses: actions/upload-artifact@v2
with:
Expand Down Expand Up @@ -79,7 +79,7 @@ jobs:
with:
name: firmware
path: ./build_output/firmware

tasmota-sensors:
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -156,6 +156,25 @@ jobs:
name: firmware
path: ./build_output/firmware

tasmota-AF:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Set up Python
uses: actions/setup-python@v1
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -U platformio
platformio upgrade --dev
platformio update
- name: Run PlatformIO
run: platformio run -e tasmota-AF
- uses: actions/upload-artifact@v2
with:
name: firmware
path: ./build_output/firmware

tasmota-BG:
runs-on: ubuntu-latest
steps:
Expand All @@ -174,7 +193,7 @@ jobs:
with:
name: firmware
path: ./build_output/firmware

tasmota-BR:
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -250,7 +269,7 @@ jobs:
with:
name: firmware
path: ./build_output/firmware

tasmota-ES:
runs-on: ubuntu-latest
steps:
Expand All @@ -269,7 +288,7 @@ jobs:
with:
name: firmware
path: ./build_output/firmware

tasmota-FR:
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -326,7 +345,7 @@ jobs:
with:
name: firmware
path: ./build_output/firmware

tasmota-HU:
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -402,7 +421,7 @@ jobs:
with:
name: firmware
path: ./build_output/firmware

tasmota-PL:
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -478,7 +497,7 @@ jobs:
with:
name: firmware
path: ./build_output/firmware

tasmota-SE:
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -554,7 +573,7 @@ jobs:
with:
name: firmware
path: ./build_output/firmware

tasmota-UK:
runs-on: ubuntu-latest
steps:
Expand Down
56 changes: 48 additions & 8 deletions .github/workflows/CI_github_ESP32.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
with:
name: firmware
path: ./build_output/firmware

tasmota32-webcam:
runs-on: ubuntu-latest
steps:
Expand All @@ -44,6 +44,26 @@ jobs:
name: firmware
path: ./build_output/firmware

tasmota32-odroidgo:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Set up Python
uses: actions/setup-python@v1
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -U platformio
platformio upgrade --dev
platformio update
- name: Run PlatformIO
run: |
platformio run -e tasmota32-odroidgo
- uses: actions/upload-artifact@v2
with:
name: firmware
path: ./build_output/firmware

tasmota32-minimal:
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -103,7 +123,7 @@ jobs:
with:
name: firmware
path: ./build_output/firmware

tasmota32-sensors:
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -164,6 +184,26 @@ jobs:
name: firmware
path: ./build_output/firmware

tasmota32-AF:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Set up Python
uses: actions/setup-python@v1
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -U platformio
platformio upgrade --dev
platformio update
- name: Run PlatformIO
run: |
platformio run -e tasmota32-AF
- uses: actions/upload-artifact@v2
with:
name: firmware
path: ./build_output/firmware

tasmota32-BG:
runs-on: ubuntu-latest
steps:
Expand All @@ -183,7 +223,7 @@ jobs:
with:
name: firmware
path: ./build_output/firmware

tasmota32-BR:
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -263,7 +303,7 @@ jobs:
with:
name: firmware
path: ./build_output/firmware

tasmota32-ES:
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -343,7 +383,7 @@ jobs:
with:
name: firmware
path: ./build_output/firmware

tasmota32-HU:
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -423,7 +463,7 @@ jobs:
with:
name: firmware
path: ./build_output/firmware

tasmota32-PL:
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -503,7 +543,7 @@ jobs:
with:
name: firmware
path: ./build_output/firmware

tasmota32-SE:
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -583,7 +623,7 @@ jobs:
with:
name: firmware
path: ./build_output/firmware

tasmota32-UK:
runs-on: ubuntu-latest
steps:
Expand Down
73 changes: 73 additions & 0 deletions .github/workflows/Tasmota_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,30 @@ jobs:
name: firmware
path: ./build_output/firmware


tasmota-AF:
needs: tasmota_pull
runs-on: ubuntu-latest
continue-on-error: true
steps:
- uses: actions/checkout@v1
- name: Set up Python
uses: actions/setup-python@v1
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -U platformio
platformio upgrade --dev
platformio update
- name: Run PlatformIO
run: |
platformio run -e tasmota-AF
- uses: actions/upload-artifact@v2
with:
name: firmware
path: ./build_output/firmware


tasmota-BG:
needs: tasmota_pull
runs-on: ubuntu-latest
Expand Down Expand Up @@ -851,6 +875,29 @@ jobs:
path: ./build_output/firmware


tasmota32-odroidgo:
needs: tasmota_pull
runs-on: ubuntu-latest
continue-on-error: true
steps:
- uses: actions/checkout@v1
- name: Set up Python
uses: actions/setup-python@v1
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -U platformio
platformio upgrade --dev
platformio update
- name: Run PlatformIO
run: |
platformio run -e tasmota32-odroidgo
- uses: actions/upload-artifact@v2
with:
name: firmware
path: ./build_output/firmware


tasmota32-knx:
needs: tasmota_pull
runs-on: ubuntu-latest
Expand Down Expand Up @@ -966,6 +1013,29 @@ jobs:
path: ./build_output/firmware


tasmota32-AF:
needs: tasmota_pull
runs-on: ubuntu-latest
continue-on-error: true
steps:
- uses: actions/checkout@v1
- name: Set up Python
uses: actions/setup-python@v1
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -U platformio
platformio upgrade --dev
platformio update
- name: Run PlatformIO
run: |
platformio run -e tasmota32-AF
- uses: actions/upload-artifact@v2
with:
name: firmware
path: ./build_output/firmware


tasmota32-BG:
needs: tasmota_pull
runs-on: ubuntu-latest
Expand Down Expand Up @@ -1513,6 +1583,7 @@ jobs:
mkdir -p ./firmware/tasmota/languages
mkdir -p ./firmware/tasmota32/languages
mkdir -p ./firmware/tasmota32/ESP32_needed_files/
mkdir -p ./firmware/tasmota32/Odroid_go_needed_files/
[ ! -f ./mv_firmware/tasmota.* ] || mv ./mv_firmware/tasmota.* ./firmware/tasmota/
[ ! -f ./mv_firmware/tasmota-sensors.* ] || mv ./mv_firmware/tasmota-sensors.* ./firmware/tasmota/
[ ! -f ./mv_firmware/tasmota-minimal.* ] || mv ./mv_firmware/tasmota-minimal.* ./firmware/tasmota/
Expand All @@ -1528,12 +1599,14 @@ jobs:
[ ! -f ./mv_firmware/tasmota32-ir*.* ] || mv ./mv_firmware/tasmota32-ir*.* ./firmware/tasmota32/
[ ! -f ./mv_firmware/tasmota32-display.* ] || mv ./mv_firmware/tasmota32-display.* ./firmware/tasmota32/
[ ! -f ./mv_firmware/tasmota32-web*.* ] || mv ./mv_firmware/tasmota32-web*.* ./firmware/tasmota32/
[ ! -f ./mv_firmware/tasmota32-odroidgo.* ] || mv ./mv_firmware/tasmota32-odroidgo.* ./firmware/tasmota32/
[ ! -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 ./tools/Esptool/Odroid_go/*.* ] || mv ./tools/Esptool/Odroid_go/*.* ./firmware/tasmota32/Odroid_go_needed_files/
[ ! -f ./FIRMWARE.md ] || mv -f ./FIRMWARE.md ./README.md
- name: Commit files # transfer the new binaries back into the repository
run: |
Expand Down
Loading

0 comments on commit a963788

Please sign in to comment.