From 52ec6e4583b9e701b57a614b9621881ec2099d52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Paj=C4=85k?= Date: Mon, 31 Jul 2023 08:25:35 +0200 Subject: [PATCH] [chore] Add checkfile to versions.yaml (#379) * Update multimod-prerelease target * Add multimod-verify to GH workflow --- .github/workflows/ci.yml | 2 +- Makefile | 6 +++--- versions.yaml | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7cafc38e..185a357b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,7 +38,7 @@ jobs: path: ~/.tools key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('./internal/tools/**') }} - name: Run linters - run: make dependabot-check license-check lint + run: make multimod-verify dependabot-check license-check lint - name: Build run: make build - name: Check clean repository diff --git a/Makefile b/Makefile index cf43947f..4b1b4cf7 100644 --- a/Makefile +++ b/Makefile @@ -170,11 +170,11 @@ check-clean-work-tree: .PHONY: multimod-verify multimod-verify: $(MULTIMOD) @echo "Validating versions.yaml" - multimod verify + $(MULTIMOD) verify .PHONY: multimod-prerelease -multimod-prerelease: $(MULTIMOD) - multimod prerelease -s=true -v ./versions.yaml -m tools +multimod-prerelease: multimod-verify $(MULTIMOD) + $(MULTIMOD) prerelease -s=true -v ./versions.yaml -m tools $(MAKE) tidy COMMIT?=HEAD diff --git a/versions.yaml b/versions.yaml index 0af95833..36797962 100644 --- a/versions.yaml +++ b/versions.yaml @@ -18,6 +18,7 @@ module-sets: modules: - go.opentelemetry.io/build-tools - go.opentelemetry.io/build-tools/checkdoc + - go.opentelemetry.io/build-tools/checkfile - go.opentelemetry.io/build-tools/chloggen - go.opentelemetry.io/build-tools/crosslink - go.opentelemetry.io/build-tools/dbotconf