diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 2151a4195..000000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,21 +0,0 @@ - -version: 2 - -jobs: - misspell: - docker: - - image: circleci/golang:1.14 - steps: - - checkout - - run: - name: Misspell Install - command: make install-misspell - - run: - name: Misspell check - command: make misspell - -workflows: - version: 2 - check-errors: - jobs: - - misspell diff --git a/.gitignore b/.gitignore index cb3a52519..72d5f9267 100644 --- a/.gitignore +++ b/.gitignore @@ -23,4 +23,4 @@ bin .swp # Misspell binary -.tools \ No newline at end of file +internal/tools/bin diff --git a/Makefile b/Makefile index f62078b90..55322fe5d 100644 --- a/Makefile +++ b/Makefile @@ -2,23 +2,24 @@ ALL_DOCS := $(shell find . -name '*.md' -not -path './.github/*' -type f | grep -v ^./node_modules | sort) PWD := $(shell pwd) -TOOLS_DIR := ./.tools -MISSPELL_BINARY=$(TOOLS_DIR)/misspell +TOOLS_DIR := ./internal/tools +MISSPELL_BINARY=bin/misspell +MISSPELL = $(TOOLS_DIR)/$(MISSPELL_BINARY) MARKDOWN_LINK_CHECK=markdown-link-check MARKDOWN_LINT=markdownlint .PHONY: install-misspell install-misspell: - go build -o $(MISSPELL_BINARY) github.com/client9/misspell/cmd/misspell + cd $(TOOLS_DIR) && go build -o $(MISSPELL_BINARY) github.com/client9/misspell/cmd/misspell .PHONY: misspell misspell: - $(MISSPELL_BINARY) -error $(ALL_DOCS) + $(MISSPELL) -error $(ALL_DOCS) .PHONY: misspell-correction misspell-correction: - $(MISSPELL_BINARY) -w $(ALL_DOCS) + $(MISSPELL) -w $(ALL_DOCS) .PHONY: install-markdown-link-check install-markdown-link-check: diff --git a/go.mod b/go.mod deleted file mode 100644 index 05d2650f5..000000000 --- a/go.mod +++ /dev/null @@ -1,5 +0,0 @@ -module github.com/open-telemetry/opentelemetry-specification - -go 1.12 - -require github.com/client9/misspell v0.3.4 diff --git a/internal/tools/go.mod b/internal/tools/go.mod new file mode 100644 index 000000000..aeac23a1d --- /dev/null +++ b/internal/tools/go.mod @@ -0,0 +1,5 @@ +module github.com/open-telemetry/opentelemetry-specification/internal/tools + +go 1.12 + +require github.com/client9/misspell v0.3.4 diff --git a/go.sum b/internal/tools/go.sum similarity index 100% rename from go.sum rename to internal/tools/go.sum diff --git a/internal/tools.go b/internal/tools/tools.go similarity index 98% rename from internal/tools.go rename to internal/tools/tools.go index 239c89ea5..bfa021b18 100644 --- a/internal/tools.go +++ b/internal/tools/tools.go @@ -15,7 +15,7 @@ // +build tools -package internal +package tools // This file follows the recommendation at // https://github.com/golang/go/wiki/Modules#how-can-i-track-tool-dependencies-for-a-module