Skip to content

Commit

Permalink
MAKE-1033: revendor grip and fix go environment (mongodb#36)
Browse files Browse the repository at this point in the history
  • Loading branch information
Kimchelly authored and Sam Kleinman committed Nov 21, 2019
1 parent ef1ec10 commit 6a6a473
Show file tree
Hide file tree
Showing 474 changed files with 142,815 additions and 20,996 deletions.
4 changes: 3 additions & 1 deletion evergreen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@ buildvariants:
expansions:
RACE_DETECTOR: true
TEST_TIMEOUT: 45m
GO_BIN_PATH: /opt/golang/go1.10/bin/go
GOROOT: /opt/golang/go1.10
run_on:
- archlinux-build
tasks: [ "testGroup" ]
Expand Down Expand Up @@ -144,6 +146,6 @@ buildvariants:
expansions:
SKIP_LONG: true
DISABLE_COVERAGE: true
GOBIN: "C:\\golang\\go1.9\\bin\\go"
GO_BIN_PATH: "C:\\golang\\go1.9\\bin\\go"
GOROOT: "C:\\golang\\go1.9"
tasks: [ "testGroup" ]
2 changes: 1 addition & 1 deletion glide.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 6 additions & 3 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ $(buildDir)/output.ftdc.test:perf_metrics.ftdc metrics.ftdc
# end test files

# start environment setup
ifneq (,$(GOBIN))
gobin := $(GOBIN)
ifneq (,$(GO_BIN_PATH))
gobin := $(GO_BIN_PATH)
else
gobin := $(shell if [ -x /opt/golang/go1.9/bin/go ]; then echo /opt/golang/go1.9/bin/go; fi)
ifeq (,$(gobin))
Expand Down Expand Up @@ -76,7 +76,7 @@ $(gopath)/src/%:
lintDeps := $(addprefix $(gopath)/src/,$(lintDeps))
$(buildDir)/.lintSetup:$(lintDeps)
@mkdir -p $(buildDir)
$(gopath)/bin/gometalinter --install >/dev/null && touch $@
$(if $(GO_BIN_PATH),export PATH=$(shell dirname $(GO_BIN_PATH)):${PATH} && ,)$(gopath)/bin/gometalinter --install >/dev/null && touch $@
$(buildDir)/run-linter:cmd/run-linter/run-linter.go $(buildDir)/.lintSetup
@mkdir -p $(buildDir)
$(gobin) build -o $@ $<
Expand Down Expand Up @@ -118,8 +118,11 @@ lint-%:$(buildDir)/output.%.lint

# start vendoring configuration
vendor-clean:
rm -rf vendor/github.com/mongodb/grip/vendor/github.com/stretchr/testify/
rm -rf vendor/github.com/mongodb/grip/vendor/github.com/pkg/errors/
find vendor/ -name "*.gif" -o -name "*.gz" -o -name "*.png" -o -name "*.ico" -o -name "*.dat" -o -name "*testdata" | xargs rm -rf
find vendor/ -name '.git' | xargs rm -rf
find vendor/ -type d -empty | xargs rm -rf
# add phony targets
phony += vendor-clean
# end vendoring tooling configuration
Expand Down
1 change: 0 additions & 1 deletion vendor/github.com/mongodb/grip/evergreen.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/github.com/mongodb/grip/glide.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/mongodb/grip/makefile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 6a6a473

Please sign in to comment.