From 02fc77474c55e421cb9d970a29a38a7719a8b728 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Mon, 3 Jul 2023 23:55:52 -0400 Subject: [PATCH] only:we do not have default bundle for a while now --- .github/workflows/hardware-ci.yaml | 4 +--- firmware/gen_config.sh | 14 -------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/.github/workflows/hardware-ci.yaml b/.github/workflows/hardware-ci.yaml index a3c091d290..538db5004c 100644 --- a/.github/workflows/hardware-ci.yaml +++ b/.github/workflows/hardware-ci.yaml @@ -16,7 +16,6 @@ jobs: runs-on: hw-ci-f4-discovery test-suite: com.rusefi.HwCiF4Discovery folder: config/boards/f407-discovery - config-name: all openocd-script: ../.github/workflows/openocd_ci_f4_discovery.cfg serial-device: /dev/serial/by-id/usb-rusEFI_LLC_rusEFI_Engine_Management_ECU_2B003B000A51343033393930-if01 @@ -25,7 +24,6 @@ jobs: runs-on: hw-ci-proteus test-suite: com.rusefi.HwCiF4Proteus folder: config/boards/proteus - config-name: proteus_f4 openocd-script: ../.github/workflows/openocd_ci_proteus.cfg serial-device: /dev/serial/by-id/usb-rusEFI_LLC_rusEFI_Engine_Management_ECU_41003D000451383037343335-if01 @@ -58,7 +56,7 @@ jobs: - name: Generate Board config working-directory: ./firmware/ - run: bash gen_config_board.sh ${{matrix.folder}} ${{matrix.config-name}} + run: bash gen_config_board.sh ${{matrix.folder}} ${{matrix.build-target}} - name: Acquire GCC working-directory: ./firmware/ diff --git a/firmware/gen_config.sh b/firmware/gen_config.sh index 603f4b2bdb..7fabd970d8 100755 --- a/firmware/gen_config.sh +++ b/firmware/gen_config.sh @@ -72,18 +72,4 @@ for BOARD in \ [ $? -eq 0 ] || { echo "ERROR generating board $BOARD_NAME $BOARD_SHORT_NAME $INI"; exit 1; } done -# -# TODO: it's time to kill the 'default' bundle concept and just live happily with explicit f407-discovery -# -# problem statement: it's desired that plain 'make' invocation compiles discovery binary -# reality: while we have per-target signature*.h and rusefi*.ini we do not have matching per-target 'engine_configuration_generated_structures.h' -# so for plain 'make' to produce f4 discovery we rely of file system engine_configuration_generated_structures.h being f4 discovery version -# -# -# default config should be generated after normal custom boards so that it would be default -# firmware/controllers/generated/rusefi_generated.h file which would be pushed into VCS -#./gen_config_default.sh -#[ $? -eq 0 ] || { echo "ERROR generating default"; exit 1; } - - exit 0