From f37b6b30f8980a0ef8d0be7f524aabc3acb11a94 Mon Sep 17 00:00:00 2001 From: Sal Date: Sat, 12 Sep 2026 11:57:51 +0100 Subject: [PATCH 1/2] ci(trunk): refresh the toolchain to the organization baseline The pinned toolchain was about three years behind: trunk CLI 1.3.1, plugins v0.0.8, prettier 2.8.3, markdownlint 0.33.0, node 18, go 1.18. prettier 2.8.3 predates GitHub alert syntax and folds a `> [!NOTE]` marker onto the following line, which stops the callout rendering, so the fork note in docs/README.md had to be written as a bold lead-in to work around it. Match z-shell/.github: CLI 1.25.0, plugins v1.11.0, prettier 3.8.3, markdownlint 0.48.0, actionlint 1.7.12, gitleaks 8.30.1, node 22, go 1.25. Restore the fork note as a real alert now that it survives formatting. Also add `*tools` and `tmp` to .trunk/.gitignore, matching the same baseline. Newer trunk versions create .trunk/tools as a symlink into the local user cache, so without the rule a machine-specific absolute path gets committed. `trunk fmt --all` produces no reformatting under the new versions, so this is a toolchain change only. `trunk check --all` reports no issues across 23 files and zunit still passes 9 tests. --- .trunk/.gitignore | 2 ++ .trunk/trunk.yaml | 16 ++++++++-------- docs/README.md | 11 ++++++----- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/.trunk/.gitignore b/.trunk/.gitignore index cf2f254..15966d0 100644 --- a/.trunk/.gitignore +++ b/.trunk/.gitignore @@ -2,6 +2,8 @@ *logs *actions *notifications +*tools plugins user_trunk.yaml user.yaml +tmp diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index 0e6a003..b27db21 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -1,22 +1,22 @@ version: 0.1 cli: - version: 1.3.1 + version: 1.25.0 plugins: sources: - id: trunk - ref: v0.0.8 + ref: v1.11.0 uri: https://github.com/trunk-io/plugins lint: enabled: - - markdownlint@0.33.0 - - actionlint@1.6.22 - - gitleaks@8.15.2 + - actionlint@1.7.12 - git-diff-check - - prettier@2.8.3 + - gitleaks@8.30.1 + - markdownlint@0.48.0 + - prettier@3.8.3 runtimes: enabled: - - go@1.18.3 - - node@18.12.1 + - go@1.25.13 + - node@22.16.0 actions: enabled: - trunk-announce diff --git a/docs/README.md b/docs/README.md index f8c2d27..674917f 100644 --- a/docs/README.md +++ b/docs/README.md @@ -4,11 +4,12 @@ A string library for Zsh. Its founding function was parsing of JSON. -**Note on the fork.** [`z-shell/zi`](https://github.com/z-shell/zi) carries a -fork of `@str-parse-json` as `.zi-parse-json` in its own `lib/zsh/install.zsh`. -It is a maintained fork rather than a mirror, and the two have deliberately -diverged, so they are not expected to be byte-identical. Fixes should be carried -across by hand in both directions. +> [!NOTE] +> [`z-shell/zi`](https://github.com/z-shell/zi) carries a fork of +> `@str-parse-json` as `.zi-parse-json` in its own `lib/zsh/install.zsh`. It is a +> maintained fork rather than a mirror, and the two have deliberately diverged, +> so they are not expected to be byte-identical. Fixes should be carried across +> by hand in both directions. ## List Of The Functions From 616f75563842756e9d91c40a596a83ee6821ab8d Mon Sep 17 00:00:00 2001 From: Sal Date: Sat, 12 Sep 2026 12:00:41 +0100 Subject: [PATCH 2/2] ci(renovate): use the organization preset instead of config:base This repository extended `config:base`, which Renovate deprecated and renamed to `config:recommended`, and which is not the shared organization preset. Every other maintained repository, `.github`, `zi`, `src`, `wiki` and `F-Sy-H`, extends `local>z-shell/.github:renovate-config` with dashboard approval. Being outside the shared preset is why the trunk toolchain here sat about three years behind without anything proposing an update. Adopt the same configuration so routine version updates stay owned by Renovate rather than by hand. --- .github/renovate.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/renovate.json b/.github/renovate.json index 4f39080..fc1528e 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -1,3 +1,8 @@ { - "extends": ["config:base"] + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": [ + "local>z-shell/.github:renovate-config", + ":dependencyDashboardApproval", + ":disableVulnerabilityAlerts" + ] }