luxolus/open-nomad
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

Merge pull request #6260 from hashicorp/c-circleci-tweak-20190903

Browse source 
ci: ignore nested pkgs in GOTEST_PKGS_EXCLUDE
This commit is contained in:
Mahmood Ali 2019-09-11 11:17:10 -07:00 committed by GitHub
parent 3e7df4c9f6 41102260ed
commit b6bf7f9a6c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
GNUmakefile
View file

@ -13,7 +13,7 @@ GO_TEST_CMD = $(if $(shell which gotestsum),gotestsum --,go test)
ifeq ($(origin GOTEST_PKGS_EXCLUDE), undefined) ifeq ($(origin GOTEST_PKGS_EXCLUDE), undefined)
GOTEST_PKGS ?= "./..." GOTEST_PKGS ?= "./..."
else else
GOTEST_PKGS=$(shell go list ./... | sed 's/github.com\/hashicorp\/nomad/./' | egrep -v "^($(GOTEST_PKGS_EXCLUDE))$$") GOTEST_PKGS=$(shell go list ./... | sed 's/github.com\/hashicorp\/nomad/./' | egrep -v "^($(GOTEST_PKGS_EXCLUDE))(/.*)?$$")
endif endif
default: help default: help
@ -170,6 +170,7 @@ check: ## Lint the source code
--deadline 10m \ --deadline 10m \
--vendor \ --vendor \
--exclude='.*\.generated\.go' \ --exclude='.*\.generated\.go' \
--exclude='.*\.pb\.go' \
--exclude='.*bindata_assetfs\.go' \ --exclude='.*bindata_assetfs\.go' \
--skip="ui/" \ --skip="ui/" \
--sort="path" \ --sort="path" \

2
client/fingerprint/storage_windows.go
View file

@ -6,7 +6,7 @@ import (
"syscall" "syscall"
) )
//go:generate go run $GOROOT/src/syscall/mksyscall_windows.go -output zstorage_windows.go storage_windows.go //go:generate go run $GOROOT/src/syscall/mksyscall_windows.go -output zstorage_windows.generated.go storage_windows.go
//sys getDiskFreeSpaceEx(dirName *uint16, availableFreeBytes *uint64, totalBytes *uint64, totalFreeBytes *uint64) (err error) = kernel32.GetDiskFreeSpaceExW //sys getDiskFreeSpaceEx(dirName *uint16, availableFreeBytes *uint64, totalBytes *uint64, totalFreeBytes *uint64) (err error) = kernel32.GetDiskFreeSpaceExW

0
client/fingerprint/zstorage_windows.go → client/fingerprint/zstorage_windows.generated.go
View file