Skip to content

Commit 2b2b89a

Browse files
pmoegenburgpmoegenburg
authored
Merge branch 'main' into RET-1025_handle_motor_driver_errors
2 parents 11214b0 + 083a816 commit 2b2b89a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+4432
-1650
lines changed

‎.github/actions/main-setup/action.yaml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: ot3-firmware Repo Setup
2+
description: Setup for ot3-firmware Github Actions
3+
4+
inputs:
5+
cache-version:
6+
description: CACHE_VERSION from secrets
7+
required: true
8+
9+
runs:
10+
using: composite
11+
steps:
12+
- name: Update and install gcc-10 & g++-10
13+
shell: bash
14+
run: |
15+
sudo apt update
16+
sudo apt install -y gcc-10 g++-10
17+
18+
- name: Setup Python
19+
uses: actions/setup-python@v4
20+
with:
21+
python-version: '3.10'
22+
23+
- name: Cache STM32 Tools
24+
uses: actions/cache@v3
25+
id: cache-tools
26+
with:
27+
path: ${{ env.DEFAULT_DIRECTORY }}/stm32-tools
28+
key: ${{ runner.os }}-${{ hashFiles('**/cmake/*') }}-${{ inputs.cache-version }}
29+
30+
- name: Setup opentrons monorepo
31+
uses: actions/checkout@v4
32+
with:
33+
repository: opentrons/opentrons
34+
path: opentrons

‎.github/workflows/bootloader.yaml

Lines changed: 0 additions & 77 deletions
This file was deleted.

‎.github/workflows/build-simulators.yaml

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
name: "build simulators"
2+
on:
3+
push:
4+
branches:
5+
- "*"
6+
workflow_dispatch:
7+
8+
concurrency:
9+
group: ${{ github.workflow }}-${{ github.ref_name }}
10+
cancel-in-progress: true
11+
12+
defaults:
13+
run:
14+
shell: bash
15+
working-directory: ot3-firmware
16+
17+
jobs:
18+
build-simulators:
19+
strategy:
20+
matrix:
21+
target: [
22+
bootloader,
23+
gantry-x,
24+
gantry-y,
25+
gripper,
26+
head,
27+
pipettes-single,
28+
pipettes-multi,
29+
pipettes-96,
30+
]
31+
name: ${{ matrix.target }} simulator
32+
runs-on: "ubuntu-20.04"
33+
timeout-minutes: 10
34+
steps:
35+
- name: Checkout ot3-firmware repo
36+
uses: actions/checkout@v4
37+
with:
38+
path: ot3-firmware
39+
40+
- name: Checkout github actions directory
41+
uses: actions/checkout@v4
42+
with:
43+
sparse-checkout: |
44+
.github/actions
45+
sparse-checkout-cone-mode: false
46+
path: actions
47+
48+
- name: Setup main
49+
uses: ./actions/.github/actions/main-setup
50+
with:
51+
cache-version: ${{ secrets.CACHE_VERSION }}
52+
53+
- name: Configure
54+
run: cmake --preset=host-gcc10 .
55+
56+
- name: setup state manager
57+
run: cmake --build ./build-host --target state-manager-setup
58+
59+
- name: Build Simulator
60+
run: cmake --build ./build-host --target ${{ matrix.target }}-simulator
61+
62+
- name: Upload Artifact
63+
uses: actions/upload-artifact@v4
64+
with:
65+
name: ${{ matrix.target }}-simulator-${{ github.ref_name }}
66+
path: ./ot3-firmware/build-host/*/simulator/*-simulator

‎.github/workflows/build-tests.yaml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
name: "build-and-test"
2+
on:
3+
push:
4+
branches:
5+
- "*"
6+
workflow_dispatch:
7+
8+
concurrency:
9+
group: ${{ github.workflow }}-${{ github.ref_name }}
10+
cancel-in-progress: true
11+
12+
defaults:
13+
run:
14+
shell: bash
15+
working-directory: ot3-firmware
16+
17+
jobs:
18+
build-and-test:
19+
name: Run all tests
20+
runs-on: "ubuntu-20.04"
21+
timeout-minutes: 10
22+
steps:
23+
- name: Checkout ot3-firmware repo
24+
uses: actions/checkout@v4
25+
with:
26+
path: ot3-firmware
27+
28+
- name: Checkout github actions directory
29+
uses: actions/checkout@v4
30+
with:
31+
sparse-checkout: |
32+
.github/actions
33+
sparse-checkout-cone-mode: false
34+
path: actions
35+
36+
- name: Setup main
37+
uses: ./actions/.github/actions/main-setup
38+
with:
39+
cache-version: ${{ secrets.CACHE_VERSION }}
40+
41+
- name: Configure
42+
run: cmake --preset=host-gcc10 .
43+
44+
- name: Test
45+
run: cmake --build ./build-host --target build-and-test

‎.github/workflows/can.yaml

Lines changed: 0 additions & 75 deletions
This file was deleted.

‎.github/workflows/codecov.yaml

Lines changed: 34 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,43 +12,57 @@ env:
1212
defaults:
1313
run:
1414
shell: bash
15+
working-directory: ot3-firmware
1516

17+
concurrency:
18+
group: ${{ github.workflow }}-${{ github.ref_name }}
19+
cancel-in-progress: true
1620

1721
jobs:
1822
generate-coverage:
1923
name: 'Generate-Coverage'
2024
runs-on: 'ubuntu-20.04'
2125
timeout-minutes: 10
22-
env:
23-
CC: gcc-10
24-
CXX: g++-10
2526
steps:
26-
- run: |
27-
sudo apt update
28-
sudo apt install gcc-10 g++-10 lcov
29-
- uses: actions/setup-python@v4
27+
- name: Checkout ot3-firmware repo
28+
uses: actions/checkout@v4
3029
with:
31-
python-version: '3.10'
32-
- name: 'Install lcov_cobertura module'
33-
run: pip install lcov_cobertura
34-
- uses: 'actions/checkout@v2'
30+
path: ot3-firmware
31+
32+
- name: Checkout github actions directory
33+
uses: actions/checkout@v4
3534
with:
36-
fetch-depth: 0
37-
- uses: "actions/cache@v3"
35+
sparse-checkout: |
36+
.github/actions
37+
sparse-checkout-cone-mode: false
38+
path: actions
39+
40+
- name: Setup main
41+
uses: ./actions/.github/actions/main-setup
3842
with:
39-
path: "./stm32-tools"
40-
key: ${{ runner.os }}-${{ hashFiles('**/cmake/*') }}-${{ secrets.CACHE_VERSION }}
41-
- name: 'Configure'
43+
cache-version: ${{ secrets.CACHE_VERSION }}
44+
45+
- name: Install LCOV
46+
run: sudo apt install -y lcov
47+
48+
- name: Install lcov_cobertura module
49+
run: pip install lcov_cobertura
50+
51+
- name: Configure
4252
run: cmake --preset=host-gcc10 -DENABLE_COVERAGE=On -DCMAKE_BUILD_TYPE=Debug
43-
- name: 'Run all tests'
53+
54+
- name: Run all tests
4455
run: cmake --build --preset tests
45-
- name: 'Generate coverage'
56+
57+
- name: Generate coverage
4658
run: cmake --build --preset tests --target lcov-geninfo
47-
- name: 'Convert coverage to xml'
59+
60+
- name: Convert coverage to xml
4861
run: lcov_cobertura build-host/lcov/data/capture/all_targets.info
62+
4963
- name: Upload coverage to Codecov
5064
uses: codecov/codecov-action@v3
5165
with:
52-
files: ./coverage.xml
66+
files: ot3-firmware/coverage.xml
5367
name: codecov-ot3-firmware
5468
fail_ci_if_error: true

0 commit comments

Comments
 (0)