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

Migrate to control-components #86

Merged
merged 1 commit into from
Nov 12, 2024
Merged

Migrate to control-components #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions .github/workflows/esp32.yml
View file
Open in desktop
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
View file
Open in desktop
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
Open in desktop
Submodule control-components added at e0407e
1 change: 0 additions & 1 deletion ocs-esp-components
Open in desktop
Submodule ocs-esp-components deleted from 3c56dd
2 changes: 1 addition & 1 deletion projects/bonsai-growlab/CMakeLists.txt
View file
Open in desktop
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