Skip to content

Commit

Permalink
supervisor: finish merge into orb-software (#174)
Browse files Browse the repository at this point in the history
* supervisor: fix cargo.toml

* update supervisor CHANGELOG

* install dbus on macos
  • Loading branch information
TheButlah authored Aug 6, 2024
1 parent e0005d4 commit af6f5d7
Show file tree
Hide file tree
Showing 6 changed files with 215 additions and 14 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/rust-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,9 @@ jobs:
uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # pin@v2
with:
key: custom-${{ hashFiles('**/*.nix', 'flake.lock') }}
- name: Install dbus
if: matrix.platform == 'macos-13'
run: brew install dbus
- name: Print environment
run: |
uname -a
Expand Down
199 changes: 187 additions & 12 deletions Cargo.lock

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

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ members = [
"orb-backend-state",
"orb-qr-link",
"orb-slot-ctrl",
"orb-supervisor",
"orb-thermal-cam-ctrl",
"orb-ui",
"orb-ui/pid",
Expand Down
8 changes: 8 additions & 0 deletions orb-supervisor/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog

## 0.5.0

### Changed

* Merged into the orb-software repo.
* Updated lockfile
* Added cargo-deb packaging, same as the rest of orb-software

## 0.4.1

### Added
Expand Down
16 changes: 14 additions & 2 deletions orb-supervisor/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
[package]
name = "orb-supervisor"
version = "0.4.1"
edition = "2021"
version = "0.5.0"
description = "Privileged daemon that supervises the orb"
authors = [
"Richard Janis Goldschmidt",
"Galileo Daras <galileo@getcoffee.io>",
]
publish = false

edition.workspace = true
license.workspace = true
repository.workspace = true
rust-version.workspace = true

[dependencies]
color-eyre = "0.6.3"
Expand All @@ -22,3 +32,5 @@ tracing-journald = "0.3.0"
[dev-dependencies]
dbus-launch = "0.2.0"
tokio = { version = "1.25.0", features = ["sync", "test-util"] }

[package.metadata.deb]
2 changes: 2 additions & 0 deletions orb-supervisor/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

Orb supervisor is a central IPC server that coordinates device state and external UX across independent agents (binaries/processes).

It runs at a higher level or privilege (root).

## Table of Contents

- Minimal viable product (MVP)
Expand Down

0 comments on commit af6f5d7

Please sign in to comment.