Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build safeboot bin for C2/C6 #19422

Merged
merged 3 commits into from
Aug 30, 2023
Merged

build safeboot bin for C2/C6 #19422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3fde9a1
build safeboot bin for C2/C6
Jason2866 Aug 30, 2023
5b97760
add C2/C6 safeboot to CI
Jason2866 Aug 30, 2023
7c7def2
Enable core3 env settings before Pio starts
Jason2866 Aug 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/Tasmota_build_devel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,9 @@ jobs:
- tasmota32s2cdc-safeboot
- tasmota32s3-safeboot
- tasmota32s3cdc-safeboot
- tasmota32c2-safeboot
- tasmota32c6-safeboot
- tasmota32c6cdc-safeboot
steps:
- uses: actions/checkout@v3
with:
Expand All @@ -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
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/Tasmota_build_master.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ jobs:
- tasmota32s2cdc-safeboot
- tasmota32s3-safeboot
- tasmota32s3cdc-safeboot
- tasmota32c2-safeboot
- tasmota32c6-safeboot
- tasmota32c6cdc-safeboot
steps:
- uses: actions/checkout@v3
with:
Expand All @@ -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
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/build_all_the_things.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
28 changes: 0 additions & 28 deletions platformio_tasmota_core3_env_sample.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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}
28 changes: 28 additions & 0 deletions platformio_tasmota_env32.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down