Merge pull request #17401 from hashicorp/jbardin/go1.10
update to go1.10
This commit is contained in:
commit
6ebb7aab56
|
@ -2,7 +2,7 @@ dist: trusty
|
|||
sudo: false
|
||||
language: go
|
||||
go:
|
||||
- 1.9.1
|
||||
- "1.10"
|
||||
|
||||
# add TF_CONSUL_TEST=1 to run consul tests
|
||||
# they were causing timouts in travis
|
||||
|
@ -34,7 +34,6 @@ script:
|
|||
- make vendor-status
|
||||
- make test
|
||||
- make e2etest
|
||||
- make vet
|
||||
- GOOS=windows go build
|
||||
branches:
|
||||
only:
|
||||
|
|
13
Makefile
13
Makefile
|
@ -68,17 +68,6 @@ cover:
|
|||
go tool cover -html=coverage.out
|
||||
rm coverage.out
|
||||
|
||||
# vet runs the Go source code static analysis tool `vet` to find
|
||||
# any common errors.
|
||||
vet:
|
||||
@echo 'go vet ./...'
|
||||
@go vet ./... ; if [ $$? -eq 1 ]; then \
|
||||
echo ""; \
|
||||
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
|
||||
|
||||
# generate runs `go generate` to build the dynamically generated
|
||||
# source files.
|
||||
generate:
|
||||
|
@ -102,4 +91,4 @@ vendor-status:
|
|||
# under parallel conditions.
|
||||
.NOTPARALLEL:
|
||||
|
||||
.PHONY: bin cover default dev e2etest fmt fmtcheck generate plugin-dev quickdev test-compile test testacc testrace tools vendor-status vet
|
||||
.PHONY: bin cover default dev e2etest fmt fmtcheck generate plugin-dev quickdev test-compile test testacc testrace tools vendor-status
|
||||
|
|
|
@ -408,7 +408,7 @@ func TestPlanStats(t *testing.T) {
|
|||
},
|
||||
},
|
||||
PlanStats{
|
||||
// data resource refreshes are not counted in our stats
|
||||
// data resource refreshes are not counted in our stats
|
||||
},
|
||||
},
|
||||
"replace": {
|
||||
|
|
|
@ -348,8 +348,8 @@ func TestInterpolater_resourceVariableMissingDuringInput(t *testing.T) {
|
|||
&ModuleState{
|
||||
Path: rootModulePath,
|
||||
Resources: map[string]*ResourceState{
|
||||
// No resources at all yet, because we're still dealing
|
||||
// with input and so the resources haven't been created.
|
||||
// No resources at all yet, because we're still dealing
|
||||
// with input and so the resources haven't been created.
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
Loading…
Reference in New Issue