From 887b082ed6a508983fcc19234c16dfb45566f2bc Mon Sep 17 00:00:00 2001 From: Tim Huyeng Date: Fri, 4 Nov 2022 15:11:54 +0100 Subject: [PATCH] added ci env --- .github/workflows/build.yml | 4 ++-- platformio_orig_s3-usb-stick.ini | 11 +++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8a54f01f..a39a5c40 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -129,8 +129,8 @@ jobs: cp src/ota_sample.conf src/ota.conf cp src/paxcounter_orig.conf src/paxcounter.conf - name: Clean - run: pio run -t clean -e usb + run: pio run -t clean -e ci - name: Run PlatformIO CI for ${{ matrix.board }} env: CI_HALFILE: ${{ matrix.board }} - run: pio run -e usb + run: pio run -e ci diff --git a/platformio_orig_s3-usb-stick.ini b/platformio_orig_s3-usb-stick.ini index 244972a4..97dd68c9 100644 --- a/platformio_orig_s3-usb-stick.ini +++ b/platformio_orig_s3-usb-stick.ini @@ -31,7 +31,6 @@ lib_deps_all = spacehuhn/SimpleButton 256dpi/MQTT @ ^2.5.0 build_flags_basic = - -include "src/hal/${board.halfile}" -include "src/paxcounter.conf" '-DCORE_DEBUG_LEVEL=${common.debug_level}' '-DLOG_LOCAL_LEVEL=${common.debug_level}' @@ -52,11 +51,19 @@ upload_speed = ${common.upload_speed} ;upload_port = COM6 platform = ${common.platform_espressif32} lib_deps = ${common.lib_deps_all} -build_flags = ${common.build_flags_all} +build_flags = + -include "src/hal/${board.halfile}" + ${common.build_flags_all} upload_protocol = ${common.upload_protocol} extra_scripts = ${common.extra_scripts} monitor_speed = ${common.monitor_speed} monitor_filters = time, esp32_exception_decoder, default [env:usb] +upload_protocol = esptool + +[env:ci] +build_flags = + -include "src/hal/${sysenv.CI_HALFILE}" ; set by CI + ${common.build_flags_all} upload_protocol = esptool \ No newline at end of file