Skip to content

Commit

Permalink
Merge branch 'main' into fouge/mcu-util-blocking-call
Browse files Browse the repository at this point in the history
  • Loading branch information
fouge committed May 7, 2024
2 parents d7acf56 + ce6dc8d commit 5c39748
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 27 deletions.
1 change: 1 addition & 0 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ on:
- orb-attest
- orb-thermal-cam-ctrl
- orb-ui
- orb-mcu-util
channel:
description: |
Which release channel?
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/rust-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -116,13 +116,13 @@ jobs:
if: ${{ matrix.platform == 'macos-13' }}
run: |
MAC_EXCLUDE=(
"--exclude orb-thermal-cam-ctrl"
"--exclude seek-camera"
"--exclude seek-camera-sys"
"--exclude can-rs"
"--exclude mcu-util"
"--exclude orb-mcu-util"
"--exclude orb-sound"
"--exclude orb-thermal-cam-ctrl"
"--exclude orb-ui"
"--exclude seek-camera"
"--exclude seek-camera-sys"
)
echo MAC_EXCLUDE="${MAC_EXCLUDE[*]}" >>${GITHUB_ENV}
cat ${GITHUB_ENV}
Expand Down Expand Up @@ -168,9 +168,9 @@ jobs:
uname -a
nix develop -c env
binaries=(
mcu-util
orb-attest
orb-backend-state
orb-mcu-util
orb-slot-ctrl
orb-thermal-cam-ctrl
orb-ui
Expand Down
5 changes: 4 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,11 @@ change things in a backwards-incompatible way at any time!
libc. PRs that use `libc` will be rejected if an equivalent safe function in
`nix` exists.
- PR names and the final squashed commit that gets merged, should start with an
area prefix, like `ir-camera:`. This helps disambigutate which part of the
area prefix, like `ir-camera:`. This helps disambiguate which part of the
monorepo changed at a glance.
- All first-party crates should start with the `orb-` prefix for the crate name,
and the crates' directories should omit this prefix. For example, the `attest`
dir contains the `orb-attest` crate.

## First time Setup

Expand Down
38 changes: 19 additions & 19 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion mcu-util/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "mcu-util"
name = "orb-mcu-util"
version = "0.7.0"
authors = ["Cyril Fougeray <cyril.fougeray@toolsforhumanity.com>"]
description = "Debug microcontrollers and manage firmware images"
Expand Down
2 changes: 1 addition & 1 deletion mcu-util/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# mcu-util
# orb-mcu-util

Utility for debugging microcontrollers and managing firmware.

Expand Down

0 comments on commit 5c39748

Please sign in to comment.