Skip to content

Commit b0336a5

Browse files
committed
Use vendors
Vendor mode was enabled but the vendor files are not checked in, starting this commit vendors are checked in
1 parent 2ba56e5 commit b0336a5

File tree

939 files changed

+418378
-5
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

939 files changed

+418378
-5
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ bin/
2020
out/
2121

2222
### Go Patch ###
23-
/vendor/
2423
/Godeps/
2524

2625
## Editor

Makefile

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,12 @@ APP=dobby
77
VERSION?=1.0
88
APP_EXECUTABLE="./out/$(APP)"
99
SRC_PACKAGES=$(shell go list ./... | grep -v "vendor")
10-
1110
SHELL=/bin/bash -o pipefail
11+
12+
ifeq ($(GOMETA_LINT),)
13+
GOMETA_LINT=$(shell command -v $(PWD)/bin/golangci-lint 2> /dev/null)
14+
endif
15+
1216
BUILD?=$(shell git describe --always --dirty 2> /dev/null)
1317
ifeq ($(BUILD),)
1418
BUILD=dev
@@ -21,6 +25,13 @@ else
2125
GO_BINARY=richgo
2226
endif
2327

28+
GO_TEST=$(shell command -v gotestsum 2> /dev/null)
29+
ifeq ($(GO_TEST),)
30+
GO_TEST=$(GO_BINARY) test -mod=vendor $(SRC_PACKAGES) -coverprofile ./out/coverage -short -v
31+
else
32+
GO_TEST=gotestsum --packages ${SRC_PACKAGES}
33+
endif
34+
2435
GOLANGCI_LINT=$(shell command -v golangci-lint 2> /dev/null)
2536
GOLANGCI_LINT_VERSION=v1.31.0
2637
ifeq ($(GOLANGCI_LINT),)
@@ -71,7 +82,7 @@ compile: ensure-build-dir ensure-vendor## Compile dobby
7182
run: compile ## Run dobby
7283
./out/dobby server
7384

74-
compile-linux: ensure-build-dir ensure-vendor ## Compile dobby for linux
85+
compile-linux: ensure-build-dir ## Compile dobby for linux
7586
GOOS=linux GOARCH=amd64 $(GO_BINARY) build -ldflags "-X main.majorVersion=$(VERSION) -X main.minorVersion=${BUILD}" -o $(APP_EXECUTABLE) ./main.go
7687

7788
build: build-deps fmt lint test compile ## Build the application
@@ -85,8 +96,8 @@ fmt:
8596
lint: setup-golangci-lint
8697
$(GOLANGCI_LINT) run -v
8798

88-
test: ensure-build-dir ensure-vendor ## Run tests
89-
ENVIRONMENT=test $(GO_BINARY) test $(SRC_PACKAGES) -p=1 -coverprofile ./out/coverage -short -v | grep -viE "start|no test files"
99+
test: ensure-build-dir ## Run tests
100+
ENVIRONMENT=test $(GO_TEST)
90101

91102
test-cover-html: ## Run tests with coverage
92103
mkdir -p ./out

vendor/github.com/KyleBanks/depth/.gitignore

Lines changed: 16 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/KyleBanks/depth/.travis.yml

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/KyleBanks/depth/LICENSE

Lines changed: 21 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/KyleBanks/depth/Makefile

Lines changed: 32 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/KyleBanks/depth/README.md

Lines changed: 232 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)