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
5 changes: 2 additions & 3 deletions .config/ship.figl
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,8 @@ publishes = false
# by `bash -eo pipefail -c` at the repository root). `runner` is the workflow's:
# `components` are the rustup components it installs, `toolchain` the Rust it
# installs (stable when left out), and `builds = false` is the one job that does
# not compile, so it needs neither the pinned Zig (`fig` and `twig`, under prov,
# flower and leaf alike, are Zig-backed and their build.rs runs `zig build`) nor
# the cargo cache. Cheapest and most likely to fail first.
# not compile, so it skips the cargo cache. Cheapest and most likely to fail
# first.
job
> *
> > id = fmt
Expand Down
16 changes: 5 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@ name: CI
#
# What the runner still owns is the toolchain, because only it knows how to
# install one: the toolchain and components a job's `runner` table asks for, and
# — for every job but the one that says `builds = false` — the pinned Zig, since
# everything under provui reaches `fig` and `twig`, which are Zig-backed and
# whose build.rs runs `zig build`. The Zig version mirrors the sibling repos.
# — for every job but the one that says `builds = false` — the cargo cache.
on:
push: { branches: [main] }
pull_request: null
Expand All @@ -27,8 +25,8 @@ env:
CARGO_TERM_COLOR: always

jobs:
# Ask ship what CI consists of. Needs no Zig and no cache: it compiles ship
# and nothing of provui's.
# Ask ship what CI consists of. Needs no cache: it compiles ship and nothing
# of provui's.
plan:
name: Plan
runs-on: ubuntu-latest
Expand Down Expand Up @@ -56,18 +54,14 @@ jobs:
steps:
- uses: actions/checkout@v7
# A field a job's runner table leaves out is null here: stable Rust, no
# components, and Zig and the cache set up unless the job says
# `builds = false`.
# components, and the cache set up unless the job says `builds = false`.
- uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ matrix.job.toolchain || 'stable' }}
components: ${{ matrix.job.components }}
- uses: mlugg/setup-zig@v2
- uses: Swatinem/rust-cache@v2
# A missing `builds` is null, and GitHub compares loosely, so `null != false`
# is false: the test is for null itself.
if: matrix.job.builds == null || matrix.job.builds
with: { version: "0.17.0" }
- uses: Swatinem/rust-cache@v2
if: matrix.job.builds == null || matrix.job.builds
- run: cargo install --locked --git https://github.com/diaryx-org/ship ship
- run: ship ci ${{ matrix.job.id }}
Loading
Loading