Skip to content

Commit

Permalink
does this work
Browse files Browse the repository at this point in the history
  • Loading branch information
ahiuchingau committed Jan 12, 2024
1 parent 0f6847f commit c856808
Show file tree
Hide file tree
Showing 7 changed files with 45 additions and 79 deletions.
12 changes: 0 additions & 12 deletions .github/actions/cache-stm32-tools/action.yaml

This file was deleted.

21 changes: 21 additions & 0 deletions .github/actions/cross-compile-check/action.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Cross-Compile/Check
description: Configure, Format and Build target

runs:
using: composite
steps:
- name: Configure G4
run: cmake --preset=cross .
working-directory: ${{ env.DEFAULT_DIRECTORY }}

- name: Format
run: cmake --build ./build-cross --target ${{ env.TARGET }}-format-ci
working-directory: ${{ env.DEFAULT_DIRECTORY }}

- name: Build g4
run: cmake --build --preset=${{ env.TARGET }}
working-directory: ${{ env.DEFAULT_DIRECTORY }}

- name: Lint
run: cmake --build ./build-cross --target ${{ env.TARGET }}-lint
working-directory: ${{ env.DEFAULT_DIRECTORY }}
18 changes: 0 additions & 18 deletions .github/actions/cross-compile-setup/action.yaml

This file was deleted.

31 changes: 0 additions & 31 deletions .github/actions/host-compile-setup/action.yaml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/actions/main-setup/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ runs:
- name: Checkout ot3-firmware repository
uses: actions/checkout@v4
with:
path: ot3-firmware
path: ${{ env.DEFAULT_DIRECTORY }}

- name: Cache STM32 Tools
uses: actions/cache@v3
id: cache-tools
with:
path: ot3-firmware/stm32-tools
path: ${{ env.DEFAULT_DIRECTORY }}/stm32-tools
key: ${{ runner.os }}-${{ hashFiles('**/cmake/*') }}-${{ inputs.cache-version }}

- name: Setup opentrons monorepo
Expand Down
33 changes: 20 additions & 13 deletions .github/workflows/bootloader.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,31 +31,38 @@ on:
- "bootloader@*"
workflow_dispatch:

env:
ci: 1
DEFAULT_DIRECTORY: ot3-firmware
TARGET: bootloader

defaults:
run:
shell: bash
working-directory: ${{ env.DEFAULT_DIRECTORY }}

jobs:
cross-compile-check:
name: "Cross-Compile/Check"
runs-on: "ubuntu-20.04"
timeout-minutes: 10
steps:
- uses: "actions/checkout@v2"
- name: Checkout github actions directory
uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: "actions/cache@v3"
sparse-checkout: |
.github/actions
sparse-checkout-cone-mode: false
path: actions

- name: Setup main
uses: ./actions/.github/actions/main-setup
with:
path: "./stm32-tools"
key: ${{ runner.os }}-${{ hashFiles('**/cmake/*') }}-${{ secrets.CACHE_VERSION }}
- name: "Configure g4"
run: cmake --preset=cross .
- name: "Format"
run: cmake --build ./build-cross --target bootloader-format-ci
- name: "Build g4"
run: cmake --build --preset=bootloader
- name: "Lint"
run: cmake --build ./build-cross --target bootloader-lint
cache-version: ${{ secrets.CACHE_VERSION }}

- name: Cross-Compile/Check
uses: ./actions/.github/actions/cross-compile-check

host-compile-test:
name: "Host-Compile/Test"
runs-on: "ubuntu-20.04"
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/gripper.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,12 @@ on:

env:
ci: 1
default-directory: ot-firmware

defaults:
run:
shell: bash
working-directory: ot3-firmware
working-directory: ${{ env.default-directory }}

jobs:
cross-compile-check:
Expand All @@ -72,8 +73,6 @@ jobs:

- name: Configure
run: cmake --preset=cross .
working-directory: ot3-firmware

- name: "Format"
run: cmake --build ./build-cross --target gripper-format-ci
- name: "Build"
Expand Down

0 comments on commit c856808

Please sign in to comment.