academy/mq-container
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use /... instead of listing packages

Browse Source
This commit is contained in:
Riccardo Biraghi
2018-04-11 15:52:09 +01:00
parent 460aec3863
commit c55d8f3956
1 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Makefile
View File

@@ -100,7 +100,7 @@ all: build-devserver build-advancedserver
test-all: test-devserver test-advancedserver test-all: test-devserver test-advancedserver
.PHONY: precommit .PHONY: precommit
precommit: vet fmt all test-all lint precommit: vet fmt lint all test-all
.PHONY: devserver .PHONY: devserver
devserver: build-devserver test-devserver devserver: build-devserver test-devserver
@@ -144,7 +144,7 @@ test-unit:
.PHONY: test-advancedserver .PHONY: test-advancedserver
test-advancedserver: test/docker/vendor test-advancedserver: test/docker/vendor
$(info $(SPACER)$(shell printf $(TITLE)"Test $(MQ_IMAGE_ADVANCEDSERVER) on Docker"$(END))) $(info $(SPACER)$(shell printf $(TITLE)"Test $(MQ_IMAGE_ADVANCEDSERVER) on Docker"$(END)))
cd test/docker && TEST_IMAGE=$(MQ_IMAGE_ADVANCEDSERVER) go test -timeout 20m -parallel $(NUM_CPU) $(TEST_OPTS_DOCKER) cd test/docker && TEST_IMAGE=$(MQ_IMAGE_ADVANCEDSERVER) go test -parallel $(NUM_CPU) $(TEST_OPTS_DOCKER)
.PHONY: build-devjmstest .PHONY: build-devjmstest
build-devjmstest: build-devjmstest:
@@ -235,26 +235,17 @@ build-advancedserver-cover: docker-version
build-explorer: downloads/$(MQ_ARCHIVE_DEV) build-explorer: downloads/$(MQ_ARCHIVE_DEV)
$(call docker-build-mq,mq-explorer:latest-$(ARCH),incubating/mq-explorer/Dockerfile-mq-explorer,$(MQ_ARCHIVE_DEV),"98102d16795c4263ad9ca075190a2d4d","IBM MQ Advanced for Developers (Non-Warranted)",$(MQ_VERSION)) $(call docker-build-mq,mq-explorer:latest-$(ARCH),incubating/mq-explorer/Dockerfile-mq-explorer,$(MQ_ARCHIVE_DEV),"98102d16795c4263ad9ca075190a2d4d","IBM MQ Advanced for Developers (Non-Warranted)",$(MQ_VERSION))
# Select all go packages inside the test directory GO_PKG_DIRS = ./cmd ./internal ./test
GO_TEST_PKG = $(sort $(dir $(wildcard ./test/*/*.go)))
GO_TEST_FILES = $(addsuffix /$(wildcard *.go), $(GO_TEST_PKG))
# Select all go packages inside the internal directory fmt: $(addsuffix /$(wildcard *.go), $(GO_PKG_DIRS))
GO_INTERNAL_PKG = $(sort $(dir $(wildcard ./internal/*/*.go))) go fmt $(addsuffix /..., $(GO_PKG_DIRS))
GO_INTERNAL_FILES = $(addsuffix /$(wildcard *.go), $(GO_CMD_PKG))
# Select all go packages inside the cmd directory vet: $(addsuffix /$(wildcard *.go), $(GO_PKG_DIRS)) test/docker/vendor
GO_CMD_PKG = $(sort $(dir $(wildcard ./cmd/*/*.go))) go vet $(addsuffix /..., $(GO_PKG_DIRS))
GO_CMD_FILES = $(addsuffix /$(wildcard *.go), $(GO_CMD_PKG))
fmt: $(GO_CMD_FILES) $(GO_TEST_FILES) $(GO_INTERNAL_FILES) lint: $(addsuffix /$(wildcard *.go), $(GO_PKG_DIRS))
go fmt $(GO_TEST_PKG) $(GO_CMD_PKG) $(GO_INTERNAL_PKG) @# This expression is necessary because /... includes the vendor directory in golint
@# As of 11/04/2018 there is an open issue to fix it: https://github.com/golang/lint/issues/320
vet: test/docker/vendor $(GO_CMD_FILES) $(GO_TEST_FILES) $(GO_INTERNAL_FILES) golint -set_exit_status $(sort $(dir $(wildcard $(addsuffix /*/*.go, $(GO_PKG_DIRS)))))
go vet $(GO_TEST_PKG) $(GO_CMD_PKG) $(GO_INTERNAL_PKG)
lint: $(GO_CMD_FILES) $(GO_TEST_FILES) $(GO_INTERNAL_FILES)
echo "\033[0;31m"; golint $(GO_TEST_PKG) $(GO_CMD_PKG) $(GO_INTERNAL_PKG)
@echo "\033[0m"
include formatting.mk include formatting.mk