Skip to content

Commit

Permalink
rename stacker to flex-stacker
Browse files Browse the repository at this point in the history
  • Loading branch information
ahiuchingau committed Jul 16, 2024
1 parent 67b32f3 commit debc5fb
Show file tree
Hide file tree
Showing 30 changed files with 36 additions and 36 deletions.
28 changes: 14 additions & 14 deletions .github/workflows/stacker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ name: 'Stacker build/test'
on:
pull_request:
paths:
- 'stm32-modules/stacker/**/*'
- 'stm32-modules/flex-stacker/**/*'
- 'stm32-modules/common/**/*'
- 'stm32-modules/include/common/**/*'
- 'stm32-modules/include/stacker/**/*'
- 'stm32-modules/include/flex-stacker/**/*'
- 'cmake/**/*'
- 'CMakeLists.txt'
- 'stm32-modules/CMakeLists.txt'
Expand All @@ -17,23 +17,23 @@ on:
- 'cmake/Arduino*'
push:
paths:
- 'stm32-modules/stacker/**/*'
- 'stm32-modules/flex-stacker/**/*'
- 'stm32-modules/common/**/*'
- 'stm32-modules/include/common/**/*'
- 'stm32-modules/include/stacker/**/*'
- 'stm32-modules/include/flex-stacker/**/*'
- 'cmake/**/*'
- 'CMakeLists.txt'
- 'stm32-modules/CMakeLists.txt'
- 'CMakePresets.json'
- '.clang-format'
- '.clang-tidy'
- '.github/workflows/stacker.yaml'
- '.github/workflows/flex-stacker.yaml'
paths_ignore:
- 'cmake/Arduino*'
branches:
- '*'
tags:
- 'stacker@*'
- 'flex-stacker@*'
workflow_dispatch:


Expand All @@ -59,17 +59,17 @@ jobs:
- name: 'Configure'
run: cmake --preset=stm32-cross .
- name: 'Format'
run: cmake --build --preset cross --target stacker-format-ci
run: cmake --build --preset cross --target flex-stacker-format-ci
- name: 'Lint'
run: cmake --build --preset cross --target stacker-lint
run: cmake --build --preset cross --target flex-stacker-lint
- name: 'Build startup app'
run: cmake --build --preset cross --target stacker-startup
run: cmake --build --preset cross --target flex-stacker-startup
- name: 'Build'
run: cmake --build --preset cross --target stacker-hex
run: cmake --build --preset cross --target flex-stacker-hex
- name: 'Build full image'
run: cmake --build --preset cross --target stacker-image-hex
run: cmake --build --preset cross --target flex-stacker-image-hex
- name: 'Build full image binary'
run: cmake --build --preset cross --target stacker-image-bin
run: cmake --build --preset cross --target flex-stacker-image-bin
host-compile-test:
name: 'Host-Compile/Test'
runs-on: 'ubuntu-20.04'
Expand All @@ -92,6 +92,6 @@ jobs:
- name: 'Configure'
run: cmake --preset=stm32-host .
- name: 'Build Simulator'
run: cmake --build --preset host --target stacker-simulator
run: cmake --build --preset host --target flex-stacker-simulator
- name: 'Build and Test'
run: cmake --build --preset stacker-tests
run: cmake --build --preset flex-stacker-tests
38 changes: 19 additions & 19 deletions CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
"thermocycler-gen2",
"heater-shaker",
"tempdeck-gen3",
"stacker"
"flex-stacker"
]
},
{
Expand All @@ -92,7 +92,7 @@
"thermocycler-gen2-build-and-test",
"heater-shaker-build-and-test",
"tempdeck-gen3-build-and-test",
"stacker-build-and-test"
"flex-stacker-build-and-test"
]
},
{
Expand Down Expand Up @@ -155,23 +155,23 @@
]
},
{
"name": "stacker-binary",
"displayName": "stacker binary",
"description": "Build the stacker cross binary",
"name": "flex-stacker-binary",
"displayName": "flex-stacker binary",
"description": "Build the flex-stacker cross binary",
"configurePreset": "stm32-cross",
"jobs": 4,
"targets": [
"stacker"
"flex-stacker"
]
},
{
"name": "stacker-debug",
"displayName": "stacker debug",
"description": "Build the stacker cross debug",
"name": "flex-stacker-debug",
"displayName": "flex-stacker debug",
"description": "Build the flex-stacker cross debug",
"configurePreset": "stm32-cross",
"jobs": 4,
"targets": [
"stacker-debug"
"flex-stacker-debug"
]
},
{
Expand All @@ -185,7 +185,7 @@
"common-lint",
"thermocycler-gen2-lint",
"tempdeck-gen3-lint",
"stacker-lint"
"flex-stacker-lint"
]
},
{
Expand All @@ -199,7 +199,7 @@
"common-format",
"thermocycler-gen2-format",
"tempdeck-gen3-format",
"stacker-format"
"flex-stacker-format"
]
},
{
Expand All @@ -213,7 +213,7 @@
"common-format",
"thermocycler-gen2-format",
"tempdeck-gen3-format",
"stacker-format"
"flex-stacker-format"
]
},
{
Expand All @@ -226,7 +226,7 @@
"heater-shaker-simulator",
"thermocycler-gen2-simulator",
"tempdeck-gen3-simulator",
"stacker-simulator"
"flex-stacker-simulator"
]
},
{
Expand All @@ -239,7 +239,7 @@
"heater-shaker-simulator",
"thermocycler-gen2-simulator",
"tempdeck-gen3-simulator",
"stacker-simulator"
"flex-stacker-simulator"
]
},
{
Expand All @@ -253,7 +253,7 @@
"common-build-and-test",
"thermocycler-gen2-build-and-test",
"tempdeck-gen3-build-and-test",
"stacker-build-and-test"
"flex-stacker-build-and-test"
]
},
{
Expand Down Expand Up @@ -287,13 +287,13 @@
]
},
{
"name": "stacker-tests",
"name": "flex-stacker-tests",
"displayName": "tests",
"description": "Runs build-and-test target for stacker",
"description": "Runs build-and-test target for flex-stacker",
"configurePreset": "stm32-host",
"jobs": 4,
"targets": [
"stacker-build-and-test"
"flex-stacker-build-and-test"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion stm32-modules/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@ add_subdirectory(common)
add_subdirectory(heater-shaker)
add_subdirectory(thermocycler-gen2)
add_subdirectory(tempdeck-gen3)
add_subdirectory(stacker)
add_subdirectory(flex-stacker)

coverage_evaluate()
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#FLEX Stacker

# This variable defines the name of the target for this subfolder.
set(TARGET_MODULE_NAME "stacker")
set(TARGET_MODULE_NAME "flex-stacker")

add_subdirectory(src)

Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stacker/errors.hpp"
#include "flex-stacker/errors.hpp"

using namespace errors;

Expand Down
File renamed without changes.

0 comments on commit debc5fb

Please sign in to comment.