diff --git a/.github/workflows/build-firmware.yaml b/.github/workflows/build-firmware.yaml index bca524e..f753122 100644 --- a/.github/workflows/build-firmware.yaml +++ b/.github/workflows/build-firmware.yaml @@ -8,32 +8,8 @@ on: workflow_dispatch: jobs: - read-meta-info: - runs-on: ubuntu-latest - outputs: - short_board_name: ${{ steps.read_meta.outputs.SHORT_BOARD_NAME }} - steps: - - name: Checkout repo - uses: actions/checkout@v4 - - - name: Read meta-info file with the board description - id: read_meta - env: - ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true' - run: | - echo "$(cat ./meta-info.env)" >> $GITHUB_OUTPUT - - - name: Debug output of the board name - run: | - echo "SHORT_BOARD_NAME = ${{ steps.read_meta.outputs.SHORT_BOARD_NAME }}" - call-workflow-passing-data: - needs: read-meta-info uses: rusefi/rusefi/.github/workflows/custom-board-build.yaml@master secrets: inherit permissions: contents: write - with: - shortBoardName: ${{ needs.read-meta-info.outputs.SHORT_BOARD_NAME }} - rusefi_dir: ext/rusefi - relative_board_dir: ../.. diff --git a/compile_firmware.sh b/compile_firmware.sh index d2fddc4..7ffae01 100755 --- a/compile_firmware.sh +++ b/compile_firmware.sh @@ -1,5 +1,3 @@ -#!/bin/bash - +#!/usr/bin/env bash cd ext/rusefi/firmware/ - -bash config/boards/common_script.sh ../../../../.. ARCH_STM32F4 +bash bin/compile.sh ../../../meta-info.env diff --git a/ext/rusefi b/ext/rusefi index 6ca3ffd..c4e4165 160000 --- a/ext/rusefi +++ b/ext/rusefi @@ -1 +1 @@ -Subproject commit 6ca3ffde25ba7e6375d41d7ea049118b29e1d367 +Subproject commit c4e41657eca89caa5f364736d74f4bca4f608471 diff --git a/meta-info.env b/meta-info.env index 6e1ec59..071e6d3 100644 --- a/meta-info.env +++ b/meta-info.env @@ -1 +1,2 @@ SHORT_BOARD_NAME=XXX +PROJECT_CPU=ARCH_STM32F4