From d1864322f365800b3e647f603379b1ed489c42cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Paj=C4=85k?= Date: Wed, 11 Oct 2023 18:18:30 +0200 Subject: [PATCH] config: Internal cleanup (#4410) --- Makefile | 2 +- tools/go.mod | 2 -- versions.yaml | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 600c2e21243..3850e93f812 100644 --- a/Makefile +++ b/Makefile @@ -77,7 +77,7 @@ $(GORELEASE): PACKAGE=golang.org/x/exp/cmd/gorelease GOJSONSCHEMA = $(TOOLS)/go-jsonschema $(GOJSONSCHEMA): PACKAGE=github.com/atombender/go-jsonschema -tools: $(GOLANGCI_LINT) $(MISSPELL) $(GOCOVMERGE) $(STRINGER) $(PORTO) $(MULTIMOD) $(DBOTCONF) $(CROSSLINK) $(GOTMPL) $(GORELEASE) +tools: $(GOLANGCI_LINT) $(MISSPELL) $(GOCOVMERGE) $(STRINGER) $(PORTO) $(MULTIMOD) $(DBOTCONF) $(CROSSLINK) $(GOTMPL) $(GORELEASE) $(GOJSONSCHEMA) # Generate diff --git a/tools/go.mod b/tools/go.mod index c32b511946b..5f06d57f7e8 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -2,8 +2,6 @@ module go.opentelemetry.io/contrib/tools go 1.21 -toolchain go1.21.1 - exclude github.com/blizzy78/varnamelen v0.6.1 require ( diff --git a/versions.yaml b/versions.yaml index 7a66df7bab4..353af94b42b 100644 --- a/versions.yaml +++ b/versions.yaml @@ -84,6 +84,7 @@ module-sets: - go.opentelemetry.io/contrib/samplers/jaegerremote/example - go.opentelemetry.io/contrib/samplers/probability/consistent excluded-modules: + - go.opentelemetry.io/contrib/config - go.opentelemetry.io/contrib/instrgen - go.opentelemetry.io/contrib/instrgen/driver - go.opentelemetry.io/contrib/instrgen/testdata/interface