Skip to content

Switch to Go 1.12 & replace dep by go mod #868

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
domgreen merged 9 commits into from
Mar 7, 2019
Merged

Switch to Go 1.12 & replace dep by go mod #868

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6df2a66
Switch to Go 1.11 & replace dep by go mod
Feb 25, 2019
d76d520
Use Go 1.12
sylr Mar 5, 2019
6f211ea
Add a few lines about go mod in CONTRIBUTING.md
sylr Mar 5, 2019
f328988
feat: add a vendoring check
Mar 6, 2019
06f5d54
fix: specify the need for git & bzr to be installed
Mar 6, 2019
1aa9619
Remove unneeded go mod vendor
Mar 7, 2019
5cb4130
Fix formatting
Mar 7, 2019
bd8d52a
Check that git and bzr are present
Mar 7, 2019
d73ed08
Add bzr download link
Mar 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat: add a vendoring check 
Signed-off-by: Sylvain Rabot <s.rabot@lectra.com>
  • Loading branch information
Sylvain Rabot committed Mar 6, 2019
commit f3289881d13af019af4410603382353bd175ae23
3 changes: 2 additions & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ jobs:
echo $GOOGLE_APPLICATION_CREDENTIALS_CONTENT > /go/src/github.com/improbable-eng/thanos/circleci-gcs-creds.json
echo "Awesome! GCS integration tests are enabled."
fi
- run: make deps
- run: make vendor
- run: make check-vendor
- run: make errcheck
- run: make check-docs
- run: make format
Expand Down
11 changes: 9 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,12 +178,19 @@ vet:
@echo ">> vetting code"
@go vet ./...

# non-phony targets

# vendor
.PHONY: vendor
vendor:
@GO111MODULE=$(GO111MODULE) go mod tidy
@GO111MODULE=$(GO111MODULE) go mod vendor

.PHONY: check-vendor
check-vendor:
@GO111MODULE=$(GO111MODULE) go mod tidy
@git diff --exit-code go.mod go.sum vendor/

# non-phony targets

# tooling deps. TODO(bwplotka): Pin them all to certain version!

$(EMBEDMD):
Expand Down