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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: ci

on:
push:
branches: [main]
branches: [development, main]
pull_request:
workflow_dispatch:

Expand Down
19 changes: 14 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,8 @@ cargo install cargo-llvm-cov --locked
cargo llvm-cov --summary-only
```

ci runs the linters, tests, and build on every push to `main` and every pull
request, and adds the coverage table to each run's summary.
ci runs the linters, tests, and build on every push to `development` and `main`
and every pull request, and adds the coverage table to each run's summary.

### code style & linting

Expand Down Expand Up @@ -198,8 +198,8 @@ it also verifies each binary with hasheus itself, so set `HASHEUS_SECRET_KEY` to
the key that signs the verifications (see [publish](#publish)). an ncryptsec
asks for its password for each one, 4 times in all.

bump the version in [`Cargo.toml`](Cargo.toml), then build to update
`Cargo.lock` to match:
when the `development` branch is ready for release, bump the version in
[`Cargo.toml`](Cargo.toml), then build to update `Cargo.lock` to match:

```bash
cargo build
Expand All @@ -210,7 +210,7 @@ commit it as the bare tag, then tag it and push both:
```bash
git commit Cargo.toml Cargo.lock --message v0.2.0
git tag v0.2.0
git push origin main v0.2.0
git push origin development v0.2.0
```

then build every platform, create the github release with them and their
Expand All @@ -227,3 +227,12 @@ with `hasheus publish`. to only build every platform, in `target/dist`:
```bash
bin/release --dry-run
```

once the release is complete, merge the `development` branch into the `main`
branch, which should always reflect the latest release:

```bash
git switch main
git merge development
git push origin main
```
Loading