Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
29 changes: 22 additions & 7 deletions .github/workflows/release-plz.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,23 @@ name: Release-plz
# the release, creates the GitHub Release(s), and
# publishes the changed crates to crates.io.
#
# crates.io auth uses OIDC trusted publishing (no stored token) — see the
# `id-token: write` permission on the release job. Configure each crate's
# trusted publisher at https://crates.io/crates/<name>/settings once it exists.
# Auth:
# - GitHub: the default GITHUB_TOKEN (no PAT/App, so no org-admin setup).
# Tradeoff: PRs opened by GITHUB_TOKEN do not trigger CI, so the
# release PR won't run the CI workflow. That's acceptable here --
# it only bumps versions/changelogs, and the feature PRs feeding
# the release already passed CI. To get CI on the release PR,
# swap in a PAT/App token later.
# - crates.io: OIDC trusted publishing (no stored token) -- see the
# `id-token: write` permission on the release job. Configure each
# crate's trusted publisher at crates.io/crates/<name>/settings.
#
# NOTE: pinned by version tag (matching release-plz's docs and the other
# actions in this repo). Heads-up for automated edits: a "name@version" ref
# looks like an email address, so some web proxies / AI assistants rewrite it
# into an obfuscated placeholder -- an invalid `uses:` ref that makes GitHub
# reject the whole workflow at startup. Verify the release-plz `uses:` lines
# after editing this file with such tools.

on:
push:
Expand All @@ -27,8 +41,9 @@ jobs:
name: Release-plz release
runs-on: ubuntu-latest
permissions:
contents: write # push tags + create GitHub Releases
id-token: write # OIDC: mint a short-lived crates.io token (trusted publishing)
contents: write # push tags + create GitHub Releases
pull-requests: read # link merged PRs in the release notes
id-token: write # OIDC: mint a short-lived crates.io token (trusted publishing)
steps:
- name: Generate GitHub App token
uses: actions/create-github-app-token@v3
Expand All @@ -45,7 +60,7 @@ jobs:
- uses: dtolnay/rust-toolchain@stable
- uses: Swatinem/rust-cache@v2
- name: Run release-plz
uses: release-plz/[email protected]
uses: release-plz/action@v0.5.130
with:
command: release
env:
Expand Down Expand Up @@ -82,7 +97,7 @@ jobs:
- uses: dtolnay/rust-toolchain@stable
- uses: Swatinem/rust-cache@v2
- name: Run release-plz
uses: release-plz/[email protected]
uses: release-plz/action@v0.5.130
with:
command: release-pr
env:
Expand Down
3 changes: 2 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ If you do not agree to those terms, please do not open a pull request.
- **License headers.** Every source file under `crates/**` carries a two-line
SPDX header. Add one to a new file with `mise run license-fix` (or
`hawkeye format`); CI enforces it. Line-sensitive trybuild fixtures under
`tests/ui/` and `tests/compile_errors/` are intentionally excluded.
`tests/compile_fail/` and `tests/compile_errors/` are intentionally
excluded.

## Workflow

Expand Down
4 changes: 2 additions & 2 deletions crates/vihaco-cpu/src/component.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ use crate::StepOutcome;
use crate::data::CPU;
use crate::instruction::Instruction;
use vihaco::Effects;
use vihaco::value::Value;
use vihaco::{component, frame::Frame, traits::*, value::Type};
use vihaco::program::{Type, Value};
use vihaco::{component, frame::Frame, traits::*};

impl Reset for CPU {
fn reset(&mut self) {
Expand Down
2 changes: 1 addition & 1 deletion crates/vihaco-cpu/src/data.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: 2026 The vihaco Authors
// SPDX-License-Identifier: MIT

use vihaco::value::Value;
use vihaco::program::Value;
use vihaco::{
frame::Frame,
traits::{FrameMemory, StackFrame, StackMemory},
Expand Down
4 changes: 2 additions & 2 deletions crates/vihaco-cpu/src/instruction.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-License-Identifier: MIT

use vihaco::Instruction;
use vihaco::value::{Type, Value};
use vihaco::program::{Type, Value};

/// `#[derive(Parse)]` notes:
///
Expand Down Expand Up @@ -210,7 +210,7 @@ impl vihaco::CanonicalInstructionSyntax for Instruction {
mod parse_tests {
use super::Instruction;
use chumsky::Parser as _;
use vihaco::value::{Type, Value};
use vihaco::program::{Type, Value};
use vihaco_parser_core::Parse;

fn parse(input: &str) -> Instruction {
Expand Down
2 changes: 1 addition & 1 deletion crates/vihaco-cpu/src/parse_helpers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
use chumsky::error::Simple;
use chumsky::extra;
use chumsky::prelude::*;
use vihaco::value::{Type, Value};
use vihaco::program::{Type, Value};
use vihaco_parser_core::Parse;

type E<'src> = extra::Err<Simple<'src, char>>;
Expand Down
Loading
Loading