Merge branch 'main' into codeboten/config-new

open-telemetry · Oct 11, 2023 · b1d368a · b1d368a
2 parents 49fd7d8 + d186432
commit b1d368a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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