From 41e36731fa8058d97e70f120e9e8f68cc16e3034 Mon Sep 17 00:00:00 2001 From: Starry Date: Tue, 27 Aug 2024 20:44:27 +0800 Subject: [PATCH] chore: Add yamllint to `make all` (#1707) * chore: Add yamllint to `make all` * Fix makefile syntax --------- Co-authored-by: Juliano Costa --- CHANGELOG.md | 2 ++ Makefile | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b6c67c21b0..fbd5d2f9a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ the release. * [accountingservice] allow running the container with non root user ([#1692](https://github.com/open-telemetry/opentelemetry-demo/pull/1692)) +* [chore] Add yamllint to `make all` + ([#1707](https://github.com/open-telemetry/opentelemetry-demo/pull/1707)) ## 1.11.1 diff --git a/Makefile b/Makefile index 654aad68ed..2156a458c8 100644 --- a/Makefile +++ b/Makefile @@ -16,10 +16,10 @@ DOCKER_COMPOSE_ENV=--env-file .env --env-file .env.override # see https://github.com/open-telemetry/build-tools/releases for semconvgen updates # Keep links in semantic_conventions/README.md and .vscode/settings.json in sync! SEMCONVGEN_VERSION=0.11.0 +YAMLLINT_VERSION=1.30.0 -# TODO: add `yamllint` step to `all` after making sure it works on Mac. .PHONY: all -all: install-tools markdownlint misspell +all: install-tools markdownlint misspell yamllint $(MISSPELL): cd $(TOOLS_DIR) && go build -o $(MISSPELL_BINARY) github.com/client9/misspell/cmd/misspell @@ -44,10 +44,10 @@ markdownlint: .PHONY: install-yamllint install-yamllint: # Using a venv is recommended - pip install -U yamllint~=1.30.0 + yamllint --version >/dev/null 2>&1 || pip install -U yamllint~=$(YAMLLINT_VERSION) .PHONY: yamllint -yamllint: +yamllint: install-yamllint yamllint . .PHONY: checklicense