fixup: stateVersion 26.05, drop ubuntu labels, simplify CI workflow
- stateVersion: 25.11 → 26.05 (match hive-gateway + hive-matrix) - default labels: drop ubuntu-latest/ubuntu-22.04 aliases — misleading since this isn't Ubuntu; hive-ci:host is the correct label - ci.yml: collapse to single `nix flake check` job — flake checks.* already covers formatting (treefmt+rustfmt), cargo test, and clippy Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
parent
bf350df442
commit
0fa0e821d9
2 changed files with 6 additions and 37 deletions
|
|
@ -13,30 +13,7 @@ jobs:
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- name: check
|
- name: check
|
||||||
run: nix flake check --no-build
|
# Runs all flake checks: formatting (treefmt+rustfmt), cargo test,
|
||||||
|
# cargo clippy, and module evaluation. No --no-build: the checks
|
||||||
fmt:
|
# derivations are the canonical source of truth.
|
||||||
name: formatting
|
run: nix flake check
|
||||||
runs-on: [hive-ci]
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v3
|
|
||||||
- name: nix fmt
|
|
||||||
run: nix fmt -- --check .
|
|
||||||
- name: cargo fmt
|
|
||||||
run: cargo fmt --all -- --check
|
|
||||||
|
|
||||||
test:
|
|
||||||
name: cargo test
|
|
||||||
runs-on: [hive-ci]
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v3
|
|
||||||
- name: test
|
|
||||||
run: cargo test --workspace
|
|
||||||
|
|
||||||
clippy:
|
|
||||||
name: cargo clippy
|
|
||||||
runs-on: [hive-ci]
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v3
|
|
||||||
- name: clippy
|
|
||||||
run: cargo clippy --workspace -- -D warnings
|
|
||||||
|
|
|
||||||
|
|
@ -115,11 +115,7 @@ in
|
||||||
|
|
||||||
labels = lib.mkOption {
|
labels = lib.mkOption {
|
||||||
type = lib.types.listOf lib.types.str;
|
type = lib.types.listOf lib.types.str;
|
||||||
default = [
|
default = [ "hive-ci:host" ];
|
||||||
"hive-ci:host"
|
|
||||||
"ubuntu-latest:host"
|
|
||||||
"ubuntu-22.04:host"
|
|
||||||
];
|
|
||||||
example = [
|
example = [
|
||||||
"hive-ci:host"
|
"hive-ci:host"
|
||||||
"nix:host"
|
"nix:host"
|
||||||
|
|
@ -128,10 +124,6 @@ in
|
||||||
Runner labels in `<name>:<scheme>` format. The `host` scheme runs
|
Runner labels in `<name>:<scheme>` format. The `host` scheme runs
|
||||||
commands directly in the container (no docker/podman). Workflow
|
commands directly in the container (no docker/podman). Workflow
|
||||||
files target this runner with `runs-on: [hive-ci]`.
|
files target this runner with `runs-on: [hive-ci]`.
|
||||||
|
|
||||||
The `ubuntu-latest` and `ubuntu-22.04` aliases let workflow files
|
|
||||||
that hardcode GitHub-style runner names work unchanged, as long as
|
|
||||||
those jobs only need git + nix + cargo and not Ubuntu APT packages.
|
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -173,7 +165,7 @@ in
|
||||||
config =
|
config =
|
||||||
{ pkgs, lib, ... }:
|
{ pkgs, lib, ... }:
|
||||||
{
|
{
|
||||||
system.stateVersion = "25.11";
|
system.stateVersion = "26.05";
|
||||||
|
|
||||||
# nspawn containers can't create user-namespaces, so nix
|
# nspawn containers can't create user-namespaces, so nix
|
||||||
# sandboxing always fails. Fall back to unsandboxed builds.
|
# sandboxing always fails. Fall back to unsandboxed builds.
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue