From 3fde9a192caf8c4d82e827b7e454aa732e29f430 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Wed, 30 Aug 2023 16:04:49 +0200 Subject: [PATCH 1/3] build safeboot bin for C2/C6 --- .github/workflows/Tasmota_build_devel.yml | 3 +++ .github/workflows/Tasmota_build_master.yml | 3 +++ platformio_tasmota_core3_env_sample.ini | 28 ---------------------- platformio_tasmota_env32.ini | 28 ++++++++++++++++++++++ 4 files changed, 34 insertions(+), 28 deletions(-) diff --git a/.github/workflows/Tasmota_build_devel.yml b/.github/workflows/Tasmota_build_devel.yml index 1d7d248520cd..8fb1340b0fc2 100644 --- a/.github/workflows/Tasmota_build_devel.yml +++ b/.github/workflows/Tasmota_build_devel.yml @@ -90,6 +90,9 @@ jobs: - tasmota32s2cdc-safeboot - tasmota32s3-safeboot - tasmota32s3cdc-safeboot + - tasmota32c2-safeboot + - tasmota32c6-safeboot + - tasmota32c6cdc-safeboot steps: - uses: actions/checkout@v3 with: diff --git a/.github/workflows/Tasmota_build_master.yml b/.github/workflows/Tasmota_build_master.yml index 6b6c4eaf0041..d7e69bc65121 100644 --- a/.github/workflows/Tasmota_build_master.yml +++ b/.github/workflows/Tasmota_build_master.yml @@ -29,6 +29,9 @@ jobs: - tasmota32s2cdc-safeboot - tasmota32s3-safeboot - tasmota32s3cdc-safeboot + - tasmota32c2-safeboot + - tasmota32c6-safeboot + - tasmota32c6cdc-safeboot steps: - uses: actions/checkout@v3 with: diff --git a/platformio_tasmota_core3_env_sample.ini b/platformio_tasmota_core3_env_sample.ini index c89b79375e55..2bd46a4dca24 100644 --- a/platformio_tasmota_core3_env_sample.ini +++ b/platformio_tasmota_core3_env_sample.ini @@ -256,15 +256,6 @@ build_flags = ${env:tasmota32s3-arduino30.build_flags} lib_extra_dirs = lib/lib_ssl, lib/libesp32 lib_ignore = ${safeboot_flags.lib_ignore} -[env:tasmota32c2-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} @@ -283,22 +274,3 @@ build_flags = ${env:tasmota32c3-arduino30.build_flags} -DFIRMWARE_SAFEBOOT lib_extra_dirs = lib/lib_ssl, lib/libesp32 lib_ignore = ${safeboot_flags.lib_ignore} - -[env:tasmota32c6-safeboot] -extends = env:tasmota32c6-arduino30 -build_unflags = ${env:tasmota32c6-arduino30.build_unflags} - -DFIRMWARE_ARDUINO30 -build_flags = ${env:tasmota32c6-arduino30.build_flags} - -DFIRMWARE_SAFEBOOT -lib_extra_dirs = lib/lib_ssl, lib/libesp32 -lib_ignore = ${safeboot_flags.lib_ignore} - -[env:tasmota32c6cdc-safeboot] -extends = env:tasmota32c6-arduino30 -board = esp32c6cdc -build_unflags = ${env:tasmota32c6-arduino30.build_unflags} - -DFIRMWARE_ARDUINO30 -build_flags = ${env:tasmota32c6-arduino30.build_flags} - -DFIRMWARE_SAFEBOOT -lib_extra_dirs = lib/lib_ssl, lib/libesp32 -lib_ignore = ${safeboot_flags.lib_ignore} diff --git a/platformio_tasmota_env32.ini b/platformio_tasmota_env32.ini index d474797bf114..dd0f1af7610e 100644 --- a/platformio_tasmota_env32.ini +++ b/platformio_tasmota_env32.ini @@ -253,6 +253,34 @@ lib_ignore = Micro-RTSP epdiy +[env:tasmota32c2-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:tasmota32c6-safeboot] +extends = env:tasmota32c6-arduino30 +build_unflags = ${env:tasmota32c6-arduino30.build_unflags} + -DFIRMWARE_ARDUINO30 +build_flags = ${env:tasmota32c6-arduino30.build_flags} + -DFIRMWARE_SAFEBOOT +lib_extra_dirs = lib/lib_ssl, lib/libesp32 +lib_ignore = ${safeboot_flags.lib_ignore} + +[env:tasmota32c6cdc-safeboot] +extends = env:tasmota32c6-arduino30 +board = esp32c6cdc +build_unflags = ${env:tasmota32c6-arduino30.build_unflags} + -DFIRMWARE_ARDUINO30 +build_flags = ${env:tasmota32c6-arduino30.build_flags} + -DFIRMWARE_SAFEBOOT +lib_extra_dirs = lib/lib_ssl, lib/libesp32 +lib_ignore = ${safeboot_flags.lib_ignore} + [env:tasmota32s3cdc-safeboot] extends = env:tasmota32s3-safeboot board = esp32s3cdc-qio_qspi From 5b9776004c8340bd27ac1b355b6bc206db348ee0 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Wed, 30 Aug 2023 16:07:45 +0200 Subject: [PATCH 2/3] add C2/C6 safeboot to CI --- .github/workflows/build_all_the_things.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build_all_the_things.yml b/.github/workflows/build_all_the_things.yml index 3f89214e3dad..f4b674973974 100644 --- a/.github/workflows/build_all_the_things.yml +++ b/.github/workflows/build_all_the_things.yml @@ -112,6 +112,9 @@ jobs: - tasmota32s2cdc-safeboot - tasmota32s3-safeboot - tasmota32s3cdc-safeboot + - tasmota32c2-safeboot + - tasmota32c6-safeboot + - tasmota32c6cdc-safeboot steps: - uses: actions/checkout@v3 - name: Set up Python From 7c7def289e8de16c0737d666968b42ce292ad61c Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Wed, 30 Aug 2023 16:15:06 +0200 Subject: [PATCH 3/3] Enable core3 env settings before Pio starts --- .github/workflows/Tasmota_build_devel.yml | 1 + .github/workflows/Tasmota_build_master.yml | 1 + .github/workflows/build_all_the_things.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/.github/workflows/Tasmota_build_devel.yml b/.github/workflows/Tasmota_build_devel.yml index 8fb1340b0fc2..6b087e613aad 100644 --- a/.github/workflows/Tasmota_build_devel.yml +++ b/.github/workflows/Tasmota_build_devel.yml @@ -105,6 +105,7 @@ jobs: 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 d7e69bc65121..02896caa0a0b 100644 --- a/.github/workflows/Tasmota_build_master.yml +++ b/.github/workflows/Tasmota_build_master.yml @@ -44,6 +44,7 @@ jobs: 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 f4b674973974..bcaddcfc398e 100644 --- a/.github/workflows/build_all_the_things.yml +++ b/.github/workflows/build_all_the_things.yml @@ -128,6 +128,7 @@ jobs: pip install -U platformio #platformio upgrade --dev #platformio update + cp ./platformio_tasmota_core3_env_sample.ini ./platformio_tasmota_core3_env.ini - name: Run PlatformIO run: platformio run -e ${{ matrix.variant }} - uses: actions/upload-artifact@v3