Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/actions/mbx/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@ inputs:
runs:
using: composite
steps:
- uses: jdx/mr-boxington-action@906ad32aec2915c312aceb21c2354cc8c0548f5f
- uses: jdx/mr-boxington-action@203ebddb3bdb1b3832473207d0a837b23b660563
with:
version: 0.6.0
version: 1.1.0
Comment thread
coderabbitai[bot] marked this conversation as resolved.
backend: github
cache-generation: v2
cache-links: ${{ inputs.cache-links }}
toolchain: ${{ inputs.toolchain }}
8 changes: 4 additions & 4 deletions .rules
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ project:
error_codes: every error/warning carries a stable ERR_AUBE_*/WARN_AUBE_* identifier from aube-codes crate; bespoke exit codes for a curated subset; see error_codes section below for conventions

mbx:
policy: compilation-heavy mise tasks and hk checks use mbx
fallback: rerun the exact equivalent cargo command from CONTRIBUTING.md without weakening or skipping the check
report: if Cargo succeeds, surface the mismatch and recommend https://github.com/jdx/mr-boxington/discussions with repository and commit, OS, mbx --version, both commands and outputs, cache summary, and MBX_BYPASS_LOG details
agent_boundary: do not silently make Cargo permanent and do not post externally without user authorization
policy: mise installs mbx 1.1 and activates its transparent Cargo shim; use ordinary cargo commands
fallback: prefix the exact equivalent cargo command from CONTRIBUTING.md with MBX_DISABLE=1 without weakening or skipping the check
report: if bypassed Cargo succeeds, surface the mismatch and recommend https://github.com/jdx/mr-boxington/discussions with repository and commit, OS, mbx --version, mbx doctor, and both commands and outputs; redact secrets, absolute cache paths, remote URLs, namespaces, and other sensitive or identifying details
agent_boundary: do not permanently disable the shim and do not post externally without user authorization

layout:
global_store: $XDG_DATA_HOME/aube/store/v1/ (contains files/ for CAS shards + index/ for cached package indexes; falls back to ~/.local/share/aube/store/v1/). `aube store path` prints this v1/ dir, matching `pnpm store path` granularity. The legacy index location at $XDG_CACHE_HOME/aube/index/ is migrated in-place on the first store open after upgrade.
Expand Down
24 changes: 13 additions & 11 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,21 @@ See the [contributing guide](https://aube.jdx.dev/contributing).

## mbx build cache

The normal `mise run build`, `mise run test`, and `mise run lint` workflows use
[mbx](https://mr-boxington.jdx.dev) for compilation-heavy Cargo work. If mbx
appears to be the problem, use the equivalent Cargo commands to unblock
yourself without skipping or weakening the check:
`mise install` installs [mbx](https://mr-boxington.jdx.dev) 1.1 and activates
its transparent Cargo shim. The normal `mise run build`, `mise run test`, and
`mise run lint` workflows therefore use the cache while invoking Cargo
normally. To bypass mbx without skipping or weakening a check, prefix the
equivalent Cargo command with `MBX_DISABLE=1`:

```sh
cargo build
cargo test
cargo clippy --all-targets -- -D warnings
MBX_DISABLE=1 cargo build
MBX_DISABLE=1 cargo test
MBX_DISABLE=1 cargo clippy --all-targets -- -D warnings
```

If Cargo succeeds where mbx fails, or mbx introduces a papercut, please start a
If bypassed Cargo succeeds where the shim fails, or mbx introduces a papercut, please start a
[mr-boxington Discussion](https://github.com/jdx/mr-boxington/discussions).
Include the repository and commit, operating system, `mbx --version`, both
commands and their output, the mbx cache summary, and an `MBX_BYPASS_LOG` when
relevant (for example, `MBX_BYPASS_LOG=mbx-bypasses.log mise run build`).
Include the repository and commit, operating system, `mbx --version`,
`mbx doctor`, and both commands and their output. Before posting, redact
secrets, absolute cache paths, remote URLs, namespaces, and other sensitive or
identifying details.
2 changes: 1 addition & 1 deletion hk.pkl
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ local linters = new Mapping<String, Step> {
["actionlint"] = Builtins.actionlint
["cargo-fmt"] = Builtins.cargo_fmt
["cargo-clippy"] = (Builtins.cargo_clippy) {
check = "mbx clippy --manifest-path {{workspace_indicator}} --quiet -- -D warnings"
check = "cargo clippy --manifest-path {{workspace_indicator}} --quiet -- -D warnings"
}
["shfmt"] = (Builtins.shfmt) {
glob = List("**/*.bats", "**/*.sh", "**/*.bash")
Expand Down
82 changes: 41 additions & 41 deletions mise.lock

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

6 changes: 3 additions & 3 deletions mise.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ cargo.binstall_native = true

[tools]
actionlint = "latest"
"github:jdx/mr-boxington" = "latest"
mr-boxington = { version = "1.1.0", postinstall = "mbx setup --global" }
Comment thread
jdx marked this conversation as resolved.
usage = "6.4.0"
communique = "latest"
"github:bnjbvr/cargo-machete" = "latest"
Expand Down Expand Up @@ -50,10 +50,10 @@ run = "hk fix --all --slow"
run = "mise x cargo:cargo-fixit@0.1.15 -- cargo fixit --clippy --all-targets --allow-dirty --allow-staged"

[tasks.build]
run = "mbx build"
run = "cargo build"

[tasks.test]
run = "mbx test"
run = "cargo test"

[tasks."docs:dev"]
depends = ["build"]
Expand Down
Loading