Skip to content

Commit d84ff3b

Browse files
author
Matt Morrison
committed
fix: Go 1.13 go.mod builds broken
1 parent bfc3212 commit d84ff3b

File tree

4 files changed

+7
-717
lines changed

4 files changed

+7
-717
lines changed

.drone.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,26 @@ steps:
88
- git fetch --tags
99

1010
- name: test
11-
image: golang:1.12
11+
image: golang:1.13
1212
volumes:
1313
- name: cache
1414
path: /go/pkg
1515
commands:
1616
- go mod download
1717
# Fail if git state is dirty after download modules
18-
- git diff --quiet
18+
# - git diff --quiet
1919
- make test
2020

2121
- name: build
22-
image: golang:1.12
22+
image: golang:1.13
2323
volumes:
2424
- name: cache
2525
path: /go/pkg
2626
commands:
2727
- make build
2828

2929
- name: release
30-
image: golang:1.12
30+
image: golang:1.13
3131
commands:
3232
- "curl -sL https://git.io/goreleaser | bash"
3333
environment:

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ test:
99
go test -v ./...
1010

1111
release:
12-
docker run --rm -it -v `pwd`:/workspace -w /workspace -e GITHUB_TOKEN golang:1.12 /workspace/scripts/release.sh
12+
docker run --rm -it -v `pwd`:/workspace -w /workspace -e GITHUB_TOKEN golang:1.13 /workspace/scripts/release.sh
1313

1414
snapshot:
15-
docker run --rm -it -v `pwd`:/workspace -w /workspace -e GITHUB_TOKEN golang:1.12 /workspace/scripts/release.sh --snapshot
15+
GOPROXY=direct docker run --rm -it -v `pwd`:/workspace -w /workspace -e GITHUB_TOKEN golang:1.13 /workspace/scripts/release.sh --snapshot
1616

1717
.PHONY: build test changelog targets $(TARGETS)

go.mod

+1-19
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,6 @@
11
module github.com/sl1pm4t/k2tf
22

3-
require (
4-
github.com/hashicorp/go-multierror v1.0.0
5-
github.com/hashicorp/hcl v1.0.0
6-
github.com/hashicorp/hcl2 v0.0.0-20190702185634-5b39d9ff3a9a
7-
github.com/hashicorp/terraform v0.12.5
8-
github.com/iancoleman/strcase v0.0.0-20180726023541-3605ed457bf7
9-
github.com/jinzhu/inflection v0.0.0-20180308033659-04140366298a
10-
github.com/mitchellh/reflectwalk v1.0.0
11-
github.com/rs/zerolog v1.11.0
12-
github.com/sirupsen/logrus v1.3.0
13-
github.com/spf13/pflag v1.0.3
14-
github.com/stretchr/testify v1.3.0
15-
github.com/terraform-providers/terraform-provider-kubernetes v1.9.0
16-
github.com/zclconf/go-cty v1.0.1-0.20190708163926-19588f92a98f
17-
k8s.io/api v0.0.0-20190222213804-5cb15d344471
18-
k8s.io/apimachinery v0.0.0-20190221213512-86fb29eff628
19-
k8s.io/client-go v10.0.0+incompatible
20-
k8s.io/kube-aggregator v0.0.0-20190508191239-c5c2b08eec9f
21-
)
3+
require github.com/terraform-providers/terraform-provider-kubernetes v1.10.0
224

235
go 1.13
246

0 commit comments

Comments
 (0)