Skip to content

Commit

Permalink
Migrate to control-components
Browse files Browse the repository at this point in the history
  • Loading branch information
dshil committed Nov 12, 2024
1 parent d771b74 commit ae1e550
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/esp32.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,26 +33,26 @@ jobs:
submodules: recursive

- name: Setup Prerequisites
uses: ./project/ocs-esp-components/.github/actions/basic_env
uses: ./project/control-components/.github/actions/basic_env
with:
OCS_COMPONENTS_PATH: ${{ env.SOURCE_PATH }}/ocs-esp-components
OCS_COMPONENTS_PATH: ${{ env.SOURCE_PATH }}/control-components
CONFIGURATION_PATH_CCACHE: ${{ env.CONFIGURATION_PATH_CCACHE }}

- name: Setup ESP-IDF
uses: ./project/ocs-esp-components/.github/actions/esp32_env
uses: ./project/control-components/.github/actions/esp32_env
with:
IDF_PATH: ${{ env.IDF_PATH }}
IDF_VERSION: ${{ env.IDF_VERSION }}

- name: bonsai-growlab perform all checks
uses: ./project/ocs-esp-components/.github/actions/basic_checks
uses: ./project/control-components/.github/actions/basic_checks
with:
PROJECT_PATH: ${{ env.SOURCE_PATH }}/projects/bonsai-growlab
OCS_COMPONENTS_PATH: ${{ env.SOURCE_PATH }}/ocs-esp-components
OCS_COMPONENTS_PATH: ${{ env.SOURCE_PATH }}/control-components

- name: Format firmware build version
id: version_formatter
uses: ./project/ocs-esp-components/.github/actions/format_build_version
uses: ./project/control-components/.github/actions/format_build_version

- name: bonsai-growlab prepare configuration
shell: bash
Expand All @@ -70,15 +70,15 @@ jobs:
echo "CONFIG_OCS_CORE_FW_NAME=\"bonsai-growlab\"" >> ${{ env.CONFIGURATION_PATH_BONSAI_GROWLAB }}
- name: bonsai-growlab build
uses: ./project/ocs-esp-components/.github/actions/esp32_build
uses: ./project/control-components/.github/actions/esp32_build
with:
IDF_PATH: ${{ env.IDF_PATH }}
PROJECT_PATH: ${{ env.SOURCE_PATH }}/projects/bonsai-growlab
CONFIGURATION_PATH_CCACHE: ${{ env.CONFIGURATION_PATH_CCACHE }}
CONFIGURATION_PATH_PROJECT: ${{ env.CONFIGURATION_PATH_BONSAI_GROWLAB }}

- name: bonsai-growlab upload
uses: ./project/ocs-esp-components/.github/actions/esp32_upload
uses: ./project/control-components/.github/actions/esp32_upload
with:
PROJECT_PATH: ${{ env.SOURCE_PATH }}/projects/bonsai-growlab
PROJECT_ID: bonsai-growlab
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "ocs-esp-components"]
path = ocs-esp-components
url = [email protected]:open-control-systems/esp-components.git
[submodule "control-components"]
path = control-components
url = [email protected]:open-control-systems/control-components.git
1 change: 1 addition & 0 deletions control-components
Submodule control-components added at e0407e
1 change: 0 additions & 1 deletion ocs-esp-components
Submodule ocs-esp-components deleted from 3c56dd
2 changes: 1 addition & 1 deletion projects/bonsai-growlab/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
cmake_minimum_required(VERSION 3.16)

set(EXTRA_COMPONENT_DIRS
"../../ocs-esp-components/components"
"../../control-components/components"
)

include($ENV{IDF_PATH}/tools/cmake/project.cmake)
Expand Down

0 comments on commit ae1e550

Please sign in to comment.