From 2872e1b3792b32f59d4a853d1bdeba5681a745ea Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Wed, 30 Aug 2023 18:23:00 +0200
Subject: [PATCH] Build C2/C6 safeboot firmwares in GH Actions (#19424)

---
 .github/workflows/Tasmota_build_devel.yml  |  4 ++
 .github/workflows/Tasmota_build_master.yml |  4 ++
 .github/workflows/build_all_the_things.yml |  4 ++
 platformio_tasmota_core3_env_sample.ini    | 51 ----------------------
 4 files changed, 12 insertions(+), 51 deletions(-)

diff --git a/.github/workflows/Tasmota_build_devel.yml b/.github/workflows/Tasmota_build_devel.yml
index 1d7d248520cd..6b087e613aad 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:
@@ -102,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 6b6c4eaf0041..02896caa0a0b 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:
@@ -41,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 3f89214e3dad..bcaddcfc398e 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
@@ -125,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
diff --git a/platformio_tasmota_core3_env_sample.ini b/platformio_tasmota_core3_env_sample.ini
index c89b79375e55..085e8f889038 100644
--- a/platformio_tasmota_core3_env_sample.ini
+++ b/platformio_tasmota_core3_env_sample.ini
@@ -16,12 +16,7 @@
 ;                tasmota32c3cdc-arduino30
 ;                tasmota32c6-arduino30
 ;                tasmota32c6cdc-arduino30
-;                tasmota32-safeboot
-;                tasmota32s2-safeboot
-;                tasmota32s3-safeboot
 ;                tasmota32c2-safeboot
-;                tasmota32c3-safeboot
-;                tasmota32c3cdc-safeboot
 ;                tasmota32c6-safeboot
 ;                tasmota32c6cdc-safeboot
 
@@ -229,33 +224,6 @@ build_flags             = ${env:arduino30.build_flags}
 monitor_filters         = esp32_exception_decoder
 lib_ignore              = ${env:arduino30.lib_ignore}
 
-[env:tasmota32-safeboot]
-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}
-
 [env:tasmota32c2-safeboot]
 extends                 = env:tasmota32c2-arduino30
 build_unflags           = ${env:tasmota32c2-arduino30.build_unflags}
@@ -265,25 +233,6 @@ build_flags             = ${env:tasmota32c2-arduino30.build_flags}
 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}
-
 [env:tasmota32c6-safeboot]
 extends                 = env:tasmota32c6-arduino30
 build_unflags           = ${env:tasmota32c6-arduino30.build_unflags}