run jsonschemagen with generate

open-telemetry · Nov 21, 2024 · 0aacc33 · 0aacc33
1 parent ee8f2b0
commit 0aacc33
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -45,7 +45,7 @@ jobs:
         touch -t ${touchtime} "${filename}"
         ls -la --time-style=full-iso "${filename}"
     - name: Generate
-      run: make generate genjsonschema
+      run: make generate
     - name: Run linters
       run: make toolchain-check license-check lint vanity-import-check
     - name: Build

diff --git a/Makefile b/Makefile
@@ -18,7 +18,7 @@ TIMEOUT = 60
 .DEFAULT_GOAL := precommit
 
 .PHONY: precommit ci
-precommit: generate toolchain-check license-check misspell go-mod-tidy golangci-lint-fix test-default
+precommit: generate jsonschemagen toolchain-check license-check misspell go-mod-tidy golangci-lint-fix test-default
 ci: generate toolchain-check license-check lint vanity-import-check build test-default check-clean-work-tree test-coverage
 
 # Tools
@@ -343,7 +343,6 @@ genjsonschema: genjsonschema-cleanup $(GOJSONSCHEMA)
 	sed -f ./config/jsonschema_patch.sed ${GENERATED_CONFIG} > ${GENERATED_CONFIG}.tmp
 	mv ${GENERATED_CONFIG}.tmp ${GENERATED_CONFIG}
 	$(MAKE) genjsonschema-cleanup
-	$(MAKE) lint
 
 .PHONY: codespell
 codespell: $(CODESPELL)