Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Run genjsonschema in CI #6353

Merged
merged 11 commits into from
Dec 3, 2024
Merged

Run genjsonschema in CI #6353

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2cac67e
run genjsonschema in CI
dmathieu Nov 20, 2024
a56a912
Merge branch 'main' into ci-genjsonschema
pellared Nov 20, 2024
0fffff1
clean jsonschema before running lint
dmathieu Nov 21, 2024
a69f2cb
fix typo in jsonschema src dir
dmathieu Nov 21, 2024
ee8f2b0
Merge branch 'main' into ci-genjsonschema
dmathieu Nov 21, 2024
0aacc33
run jsonschemagen with generate
dmathieu Nov 21, 2024
5e45492
Merge branch 'main' into ci-genjsonschema
dmathieu Nov 21, 2024
9af392e
Merge branch 'main' into ci-genjsonschema
dmathieu Nov 22, 2024
cf430fe
add genjsonschema to make ci
dmathieu Nov 27, 2024
bbf3451
properly run jsonschemagen on generate
dmathieu Nov 27, 2024
4587256
Merge branch 'main' into ci-genjsonschema
dmathieu Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
touch -t ${touchtime} "${filename}"
ls -la --time-style=full-iso "${filename}"
- name: Generate
run: make generate
run: make generate genjsonschema
- name: Run linters
run: make toolchain-check license-check lint vanity-import-check
- name: Build
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ update-all-otel-deps:
done

# The source directory for opentelemetry-configuration schema.
OPENTELEMETRY_CONFIGURATION_JSONSCHEMA_SRC_DIR=tmp/opentelememetry-configuration
OPENTELEMETRY_CONFIGURATION_JSONSCHEMA_SRC_DIR=tmp/opentelemetry-configuration

# The SHA matching the current version of the opentelemetry-configuration schema to use
OPENTELEMETRY_CONFIGURATION_JSONSCHEMA_VERSION=v0.3.0
Expand All @@ -342,8 +342,8 @@ genjsonschema: genjsonschema-cleanup $(GOJSONSCHEMA)
@echo Modify jsonschema generated files.
sed -f ./config/jsonschema_patch.sed ${GENERATED_CONFIG} > ${GENERATED_CONFIG}.tmp
mv ${GENERATED_CONFIG}.tmp ${GENERATED_CONFIG}
$(MAKE) lint
$(MAKE) genjsonschema-cleanup
$(MAKE) lint

.PHONY: codespell
codespell: $(CODESPELL)
Expand Down
Loading