Skip to content

Unit 1: build infra — resolve CI conflict, bump flake to nixos-25.05, modernize shell#3

Open
stradichenko wants to merge 1 commit intomainfrom
unit-01-build-infra-ci-flake-hugo-bump
Open

Unit 1: build infra — resolve CI conflict, bump flake to nixos-25.05, modernize shell#3
stradichenko wants to merge 1 commit intomainfrom
unit-01-build-infra-ci-flake-hugo-bump

Conversation

@stradichenko
Copy link
Copy Markdown
Owner

Summary

  • Resolve unresolved git merge-conflict markers in .github/workflows/test.yml that were breaking CI.
  • Bump flake nixpkgs to nixos-25.05 (Hugo 0.147.3) and refresh flake.lock. Keep theme.toml min_version = "0.136.0" so consumers on slightly older Hugo still install — templates limit themselves to features available there.
  • Modernize the dev shell: switch to mkShellNoCC, add formatter (nixpkgs-fmt) and checks.build, and add prettier, eslint, stylelint(+config-standard), golangci-lint, dart-sass, pagefind, python3 to packages. Bump CI Hugo to 0.147.3. Delete host-mutating test-hugo-theme.sh. Harden validate-theme.sh (set -euo pipefail, fix legacy config.toml path, fix unescaped regex dot).

Test plan

  • nix flake check exits 0 inside the worktree.
  • nix develop -c hugo version reports 0.147.3.
  • actionlint (or gh workflow view) accepts both workflows.
  • CI run on this branch reaches the build step (no merge-marker syntax errors).

Part of the PKB-theme modernization batch (15 units).

- Resolve unresolved git merge-conflict markers in .github/workflows/test.yml.
- Bump flake nixpkgs to nixos-25.05 (Hugo 0.147.3). Run nix flake update.
- Add nixpkgs-fmt formatter and a checks.build entry. Switch dev shell to
  mkShellNoCC. Add prettier, eslint, stylelint(+config-standard),
  golangci-lint, dart-sass, pagefind, python3 to the dev shell.
- Bump CI Hugo to 0.147.3.
- theme.toml: keep min_version = 0.136.0 so consumers on slightly older
  Hugo still install; templates limit themselves to <= 0.136 features.
- Delete host-mutating test-hugo-theme.sh.
- validate-theme.sh: shebang fix, set -euo pipefail, fix legacy
  config.toml filename and unescaped regex dot. Now a thin wrapper
  around nix flake check.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant