Skip to content

Commit

Permalink
Merge pull request #47 from squat/go114
Browse files Browse the repository at this point in the history
vendor: bump to go 1.14
  • Loading branch information
squat committed May 5, 2020
2 parents 0a10dc9 + 77d0863 commit 79a1315
Show file tree
Hide file tree
Showing 30 changed files with 162 additions and 6,541 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ services:
- docker

go:
- 1.13.4
- 1.14.2

env:
- GO111MODULE=on DOCKER_CLI_EXPERIMENTAL=enabled
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ LISTER_GEN_BINARY := bin/lister-gen
OPENAPI_GEN_BINARY := bin/openapi-gen
GOLINT_BINARY := bin/golint

BUILD_IMAGE ?= golang:1.13.4-alpine
BUILD_IMAGE ?= golang:1.14.2-alpine
BASE_IMAGE ?= alpine:3.11

build: $(BINS)
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
module github.com/squat/kilo

go 1.14

require (
github.com/PuerkitoBio/purell v1.1.1 // indirect
github.com/ant31/crd-validation v0.0.0-20180801212718-38f6a293f140
Expand Down Expand Up @@ -60,5 +62,3 @@ require (
k8s.io/utils v0.0.0-20190308190857-21c4ce38f2a7 // indirect
sigs.k8s.io/yaml v1.1.0 // indirect
)

go 1.13
61 changes: 0 additions & 61 deletions vendor/golang.org/x/sys/unix/mkasm_darwin.go

This file was deleted.

106 changes: 0 additions & 106 deletions vendor/golang.org/x/sys/unix/mkpost.go

This file was deleted.

Loading

0 comments on commit 79a1315

Please sign in to comment.