~/Projects/Tasmota
git clone https://code.lsong.org/Tasmota
Commit
- Commit
- 2872e1b3792b32f59d4a853d1bdeba5681a745ea
- Author
- Jason2866 <24528715+[email protected]>
- Date
- 2023-08-30 18:23:00 +0200 +0200
- Diffstat
.github/workflows/Tasmota_build_devel.yml | 5 ++
.github/workflows/Tasmota_build_master.yml | 4 +
.github/workflows/build_all_the_things.yml | 5 ++
platformio_tasmota_core3_env_sample.ini | 52 ------------------------
Build C2/C6 safeboot firmwares in GH Actions (#19424)
diff --git a/.github/workflows/Tasmota_build_devel.yml b/.github/workflows/Tasmota_build_devel.yml
index 1d7d248520cdb772251aff3f92a0cd83411c3078..6b087e613aadd8aefc3846f7f77b42217a1c1d50 100644
--- a/.github/workflows/Tasmota_build_devel.yml
+++ b/.github/workflows/Tasmota_build_devel.yml
@@ -91,6 +91,10 @@ - tasmota32s2cdc-safeboot
- tasmota32s3-safeboot
- tasmota32s3cdc-safeboot
+ - name: Make Berry and Tasmota Berry code
+ - tasmota32c6-safeboot
+ - tasmota32c6cdc-safeboot
+
- '**.md' # Do no build if *.md files changes
- uses: actions/checkout@v3
with:
@@ -103,6 +107,7 @@ - name: Install dependencies
run: |
pip install wheel
pip install -U platformio
+ cp ./platformio_tasmota_core3_env_sample.ini ./platformio_tasmota_core3_env.ini
- name: Run PlatformIO
run: platformio run -e ${{ matrix.variant }}
- name: Upload safeboot firmware artifacts
diff --git a/.github/workflows/Tasmota_build_master.yml b/.github/workflows/Tasmota_build_master.yml
index 6b6c4eaf0041ccc0015034b1e68af963e1b04ad9..02896caa0a0b41137e24260c8b707b230c0326c2 100644
--- a/.github/workflows/Tasmota_build_master.yml
+++ b/.github/workflows/Tasmota_build_master.yml
@@ -29,6 +29,9 @@ - tasmota32s2-safeboot
- tasmota32s2cdc-safeboot
- tasmota32s3-safeboot
- tasmota32s3cdc-safeboot
+ - tasmota32c2-safeboot
+ - tasmota32c6-safeboot
+ - tasmota32c6cdc-safeboot
steps:
- uses: actions/checkout@v3
with:
@@ -41,6 +44,7 @@ - name: Install dependencies
run: |
pip install wheel
pip install -U platformio
+ cp ./platformio_tasmota_core3_env_sample.ini ./platformio_tasmota_core3_env.ini
- name: Run PlatformIO
run: platformio run -e ${{ matrix.variant }}
- name: Upload safeboot firmware artifacts
diff --git a/.github/workflows/build_all_the_things.yml b/.github/workflows/build_all_the_things.yml
index 3f89214e3dad666b93886351c5e62560fe8c1c3d..bcaddcfc398e0e478fc472ed346b116209ae87ae 100644
--- a/.github/workflows/build_all_the_things.yml
+++ b/.github/workflows/build_all_the_things.yml
@@ -112,6 +112,9 @@ - tasmota32s2-safeboot
- tasmota32s2cdc-safeboot
- tasmota32s3-safeboot
- tasmota32s3cdc-safeboot
+ - tasmota32c2-safeboot
+ - tasmota32c6-safeboot
+ - tasmota32c6cdc-safeboot
steps:
- uses: actions/checkout@v3
- name: Set up Python
@@ -125,6 +128,8 @@ #python -m pip install --upgrade pip
pip install -U platformio
#platformio upgrade --dev
on:
+ - '**.cpp'
+ - '**.c'
- '**.cpp'
- name: Run PlatformIO
run: platformio run -e ${{ matrix.variant }}
diff --git a/platformio_tasmota_core3_env_sample.ini b/platformio_tasmota_core3_env_sample.ini
index c89b79375e559c5a9e648ac2c62729a5d772553c..085e8f8890385612f9e0f3ea6d18c188355b25dd 100644
--- a/platformio_tasmota_core3_env_sample.ini
+++ b/platformio_tasmota_core3_env_sample.ini
@@ -16,12 +16,7 @@ ; tasmota32c3-arduino30
; tasmota32c3cdc-arduino30
; tasmota32c6-arduino30
; tasmota32c6cdc-arduino30
-; tasmota32-safeboot
-; tasmota32s2-safeboot
-; tasmota32s3-safeboot
; tasmota32c2-safeboot
-; tasmota32c3-safeboot
-; tasmota32c3cdc-safeboot
; tasmota32c6-safeboot
; tasmota32c6cdc-safeboot
@@ -230,58 +225,11 @@ monitor_filters = esp32_exception_decoder
lib_ignore = ${env:arduino30.lib_ignore}
[platformio]
-; tasmota32-odroid30
-extends = env:tasmota32-arduino30
-build_unflags = ${env:tasmota32-arduino30.build_unflags}
- -DFIRMWARE_ARDUINO30
-build_flags = ${env:tasmota32-arduino30.build_flags}
- -DFIRMWARE_SAFEBOOT
-lib_extra_dirs = lib/lib_ssl, lib/libesp32
-lib_ignore = ${safeboot_flags.lib_ignore}
-
-[env:tasmota32s2-safeboot]
-extends = env:tasmota32s2-arduino30
-build_unflags = ${env:tasmota32s2-arduino30.build_unflags}
- -DFIRMWARE_ARDUINO30
-build_flags = ${env:tasmota32s2-arduino30.build_flags}
- -DFIRMWARE_SAFEBOOT
-lib_extra_dirs = lib/lib_ssl, lib/libesp32
-lib_ignore = ${safeboot_flags.lib_ignore}
-
-[env:tasmota32s3-safeboot]
-extends = env:tasmota32s3-arduino30
-build_unflags = ${env:tasmota32s3-arduino30.build_unflags}
- -DFIRMWARE_ARDUINO30
-build_flags = ${env:tasmota32s3-arduino30.build_flags}
- -DFIRMWARE_SAFEBOOT
-lib_extra_dirs = lib/lib_ssl, lib/libesp32
-lib_ignore = ${safeboot_flags.lib_ignore}
-
-[platformio]
; tasmota32c3-safeboot
extends = env:tasmota32c2-arduino30
build_unflags = ${env:tasmota32c2-arduino30.build_unflags}
-DFIRMWARE_ARDUINO30
build_flags = ${env:tasmota32c2-arduino30.build_flags}
- -DFIRMWARE_SAFEBOOT
-lib_extra_dirs = lib/lib_ssl, lib/libesp32
-lib_ignore = ${safeboot_flags.lib_ignore}
-
-[env:tasmota32c3-safeboot]
-extends = env:tasmota32c3-arduino30
-build_unflags = ${env:tasmota32c3-arduino30.build_unflags}
- -DFIRMWARE_ARDUINO30
-build_flags = ${env:tasmota32c3-arduino30.build_flags}
- -DFIRMWARE_SAFEBOOT
-lib_extra_dirs = lib/lib_ssl, lib/libesp32
-lib_ignore = ${safeboot_flags.lib_ignore}
-
-[env:tasmota32c3cdc-safeboot]
-extends = env:tasmota32c3-arduino30
-board = esp32c3cdc
-build_unflags = ${env:tasmota32c3-arduino30.build_unflags}
- -DFIRMWARE_ARDUINO30
-build_flags = ${env:tasmota32c3-arduino30.build_flags}
-DFIRMWARE_SAFEBOOT
lib_extra_dirs = lib/lib_ssl, lib/libesp32
lib_ignore = ${safeboot_flags.lib_ignore}
