Updates to GNUmakefile and .travis.yml #21
Conversation
Tell Travis to instruct go commands to use top-level vendor directory to satisfy dependencies.
| @@ -1,23 +1,24 @@ | |||
| dist: trusty | |||
| dist: xenial | |||
There was a problem hiding this comment.
AWS has updated to Xenial.
| sudo: required | ||
| services: | ||
| - docker | ||
| language: go | ||
| go: | ||
| - "1.9.x" | ||
| - "1.12.x" |
| @@ -1,4 +1,4 @@ | |||
| FROM golang:1.11.6-alpine3.9 | |||
| FROM golang:1.12.5-alpine3.9 | |||
There was a problem hiding this comment.
We're using go 1.12.x in the Travis VM, so might as well update our Docker environment to use it too.
| @@ -8,6 +8,10 @@ RUN apk add --update \ | |||
| shadow \ | |||
| vim | |||
|
|
|||
| # Additional go tools | |||
There was a problem hiding this comment.
These are needed for the new lint make target.
| @@ -102,4 +102,4 @@ else | |||
| @docker run -it --name $(DOCKER_CONTAINER_NAME) --env ITM_BASE_URL --env ITM_CLIENT_ID --env ITM_CLIENT_SECRET --mount type=bind,src=$(PWD),dst=$(DOCKER_SOURCE_DIR) --mount type=bind,src=$(ITM_HOST_MODULE_DIR),dst=/terraform-module $(DOCKER_IMAGE_NAME) /bin/bash | |||
| endif | |||
|
|
|||
| .PHONY: build test testacc vet fmt fmtcheck errcheck vendor-status test-compile website website-test | |||
| .PHONY: build fmt fmtcheck install-tools lint test test-compile testacc website website-lint website-test | |||
There was a problem hiding this comment.
Will keep these dependencies alphabetized from now on.
| @sh -c "'$(CURDIR)/scripts/gofmtcheck.sh'" | ||
|
|
||
| errcheck: |
There was a problem hiding this comment.
As far as I can tell, nothing uses this.
| errcheck: | ||
| @sh -c "'$(CURDIR)/scripts/errcheck.sh'" | ||
|
|
||
| vendor-status: |
There was a problem hiding this comment.
Removed per Hashicorp.
| echo "Vet found suspicious constructs. Please check the reported constructs"; \ | ||
| echo "and fix them if necessary before submitting the code for review."; \ | ||
| exit 1; \ | ||
| fi |
There was a problem hiding this comment.
does the lint check basically make this target redundant?
There was a problem hiding this comment.
Yes, it appears that most of the big providers have replaced the vet target with the lint one.
This PR updates GNUmakefile and .travis.yml as described by #14. Also includes some changes to emulate Google and AWS providers.
Testing should minimally include calling
make testacc.make lintworks in the container now too, but you'll need to runmake docker-buildagain and start over with a fresh container (i.e.docker rm citrixitm_tf_dev_container, if necessary, beforemake docker-run).