Skip to content

Commit 055b943

Browse files
dmathieupellared
andauthored
Run genjsonschema in CI (#6353)
#6347 is updating the generated JSON schema, as it has changed with upgrades of `go-jsonschema`. We update the binary semi automatically with dependabot. However, this means there could be unseen regressions or changes like this that we miss. This runs the schema generation on CI, before checking for a clean repository, so we can keep the generated code up to date with the binary version. This should fail until #6347 and #6349 are merged. --------- Co-authored-by: Robert Pająk <[email protected]>
1 parent 0fc2c4c commit 055b943

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ $(CODESPELL): PACKAGE=codespell
107107
# Generate
108108

109109
.PHONY: generate
110-
generate: go-generate vanity-import-fix
110+
generate: go-generate genjsonschema vanity-import-fix
111111

112112
.PHONY: go-generate
113113
go-generate: $(OTEL_GO_MOD_DIRS:%=go-generate/%)
@@ -316,7 +316,7 @@ update-all-otel-deps:
316316
done
317317

318318
# The source directory for opentelemetry-configuration schema.
319-
OPENTELEMETRY_CONFIGURATION_JSONSCHEMA_SRC_DIR=tmp/opentelememetry-configuration
319+
OPENTELEMETRY_CONFIGURATION_JSONSCHEMA_SRC_DIR=tmp/opentelemetry-configuration
320320

321321
# The SHA matching the current version of the opentelemetry-configuration schema to use
322322
OPENTELEMETRY_CONFIGURATION_JSONSCHEMA_VERSION=v0.3.0
@@ -342,7 +342,6 @@ genjsonschema: genjsonschema-cleanup $(GOJSONSCHEMA)
342342
@echo Modify jsonschema generated files.
343343
sed -f ./config/jsonschema_patch.sed ${GENERATED_CONFIG} > ${GENERATED_CONFIG}.tmp
344344
mv ${GENERATED_CONFIG}.tmp ${GENERATED_CONFIG}
345-
$(MAKE) lint
346345
$(MAKE) genjsonschema-cleanup
347346

348347
.PHONY: codespell

0 commit comments

Comments
 (0)