From facb2238433643e28b283c3ccbe746ca5caa5a78 Mon Sep 17 00:00:00 2001 From: Eli Mallon Date: Tue, 14 Jul 2026 21:20:51 -0700 Subject: [PATCH] make go-lexicons: glex install before codegen; keep manifest in tool-native form MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On a fresh clone the vendored third-party lexicons (lexicons/{app,com, tools,games}) are gitignored and absent, and `make lexicons` ran Go codegen before anything fetched them — so `make ci-lexicons` failed in CI with "schema not found in catalog: app.bsky.actor.defs#profileViewBasic". Run `glex install` (manifest-pinned) first. Also store lexicons.json exactly as the tools write it (no trailing newline) — the previous newline fix got rewritten by every install, which would trip ci-lexicons' git-diff check; prettier now ignores the file instead. Co-Authored-By: Claude Fable 5 --- Makefile | 3 ++- lexicons.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 01321990..82fe9355 100644 --- a/Makefile +++ b/Makefile @@ -388,7 +388,8 @@ GO_LEXICON_GEN := github.com/streamplace/glex/cmd/glex .PHONY: go-lexicons go-lexicons: - go tool github.com/streamplace/glex/cmd/glex build \ + go tool github.com/streamplace/glex/cmd/glex install \ + && go tool github.com/streamplace/glex/cmd/glex build \ --lexicons-dir lexicons \ --output-dir pkg \ --module-path stream.place/streamplace/pkg \ diff --git a/lexicons.json b/lexicons.json index 94261f2b..34aca92e 100644 --- a/lexicons.json +++ b/lexicons.json @@ -217,4 +217,4 @@ "cid": "bafyreic3l2rmh2ugirt3jz372wcvy333m7t2ynlyzj2k54oshijs6lxdfu" } } -} +} \ No newline at end of file -- 2.51.2