Skip to content

Commit 5f27966

Browse files
deliahudeliahu
authored
Update to go 1.12 (#170)
1 parent 270e6c9 commit 5f27966

File tree

8 files changed

+160
-105
lines changed

8 files changed

+160
-105
lines changed

‎.circleci/config.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ commands:
1717
- run:
1818
name: Install Go
1919
command: |
20-
wget https://dl.google.com/go/go1.11.5.linux-amd64.tar.gz
21-
sudo tar -C /usr/local -xzf go1.11.5.linux-amd64.tar.gz
20+
wget https://dl.google.com/go/go1.12.6.linux-amd64.tar.gz
21+
sudo tar -C /usr/local -xzf go1.12.6.linux-amd64.tar.gz
2222
rm -rf go*.tar.gz
2323
echo 'export PATH=$PATH:/usr/local/go/bin' >> $BASH_ENV
2424
echo 'export PATH=$PATH:~/go/bin' >> $BASH_ENV
@@ -30,7 +30,7 @@ jobs:
3030
steps:
3131
- checkout
3232
- install-go
33-
- run: GO111MODULE=off go get -u -v golang.org/x/lint/golint
33+
- run: go get -u -v golang.org/x/lint/golint
3434
- run: sudo pip3 install black
3535
- run:
3636
name: Lint

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ aws-clear-bucket:
9090
@./dev/aws.sh clear-bucket
9191

9292
tools:
93-
@GO111MODULE=off go get -u -v golang.org/x/lint/golint
93+
@go get -u -v golang.org/x/lint/golint
9494
@go get -u -v github.com/VojtechVitek/rerun/cmd/rerun
9595
@pip3 install black
9696

‎build/cli.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ function build_and_upload() {
3232

3333
os=$1
3434
echo -e "\nBuilding Cortex CLI for $os"
35-
GOOS=$os GOARCH=amd64 CGO_ENABLED=0 GO111MODULE=on go build -o cortex "$ROOT/cli"
35+
GOOS=$os GOARCH=amd64 CGO_ENABLED=0 go build -o cortex "$ROOT/cli"
3636
if [ "$upload" == "true" ]; then
3737
echo "Uploading Cortex CLI to s3://$CLI_BUCKET_NAME/$CORTEX_VERSION/cli/$os/cortex"
3838
aws s3 cp cortex s3://$CLI_BUCKET_NAME/$CORTEX_VERSION/cli/$os/cortex --only-show-errors

‎build/test.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ set -euo pipefail
2020
ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")"/.. >/dev/null && pwd)"
2121

2222
function run_go_tests() {
23-
(cd $ROOT && GO111MODULE=on go test ./... && echo "go tests passed")
23+
(cd $ROOT && go test ./... && echo "go tests passed")
2424
}
2525

2626
function run_python_tests() {

‎docs/development.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Prerequisites
44

5-
1. Go (>=1.11.5)
5+
1. Go (>=1.12.6)
66
1. Docker
77
1. eksctl
88
1. kubectl

‎go.mod‎

Lines changed: 29 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,56 @@
1-
// locked dependency versions:
2-
// github.com/GoogleCloudPlatform/spark-on-k8s-operator v1alpha1-0.5-2.4.0
3-
// github.com/argoproj/argo v2.2.1
4-
// k8s.io/client-go v10.0.0
5-
// go to the commit for the client-go release and browse to Godeps/Godeps.json to find these SHAs:
6-
// k8s.io/api 89a74a8d264df0e993299876a8cde88379b940ee
7-
// k8s.io/apimachinery 2b1284ed4c93a43499e781493253e2ac5959c4fd
8-
//
91
// to update all:
2+
// go clean -modcache (optional)
103
// rm go.mod go.sum
114
// go mod tidy
12-
// (replace versions of locked dependencies above)
5+
// replace these lines in go.mod:
6+
// github.com/GoogleCloudPlatform/spark-on-k8s-operator v1alpha1-0.5-2.4.0
7+
// github.com/argoproj/argo v2.3.0
8+
// github.com/cortexlabs/yaml v2.2.2
9+
// k8s.io/client-go v10.0.0
10+
// k8s.io/api 89a74a8d264df0e993299876a8cde88379b940ee
11+
// k8s.io/apimachinery 2b1284ed4c93a43499e781493253e2ac5959c4fd
12+
// (note: go to the commit for the client-go release and browse to Godeps/Godeps.json to find the SHAs for k8s.io/api and k8s.io/apimachinery)
1313
// go mod tidy
1414
// check the diff in this file
1515

1616
module github.com/cortexlabs/cortex
1717

18+
go 1.12
19+
1820
require (
1921
github.com/GoogleCloudPlatform/spark-on-k8s-operator v0.0.0-20181208011959-62db1d66dafa
2022
github.com/argoproj/argo v2.3.0+incompatible
21-
github.com/aws/aws-sdk-go v1.16.17
23+
github.com/aws/aws-sdk-go v1.20.5
2224
github.com/cortexlabs/yaml v0.0.0-20190530233410-11baebde6c89
2325
github.com/davecgh/go-spew v1.1.1
24-
github.com/emicklei/go-restful v2.8.0+incompatible // indirect
25-
github.com/go-openapi/spec v0.18.0 // indirect
26-
github.com/gogo/protobuf v1.2.0 // indirect
27-
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
28-
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c // indirect
29-
github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf // indirect
30-
github.com/googleapis/gnostic v0.2.0 // indirect
31-
github.com/gorilla/context v1.1.1 // indirect
32-
github.com/gorilla/mux v1.6.2
26+
github.com/emicklei/go-restful v2.9.6+incompatible // indirect
27+
github.com/go-openapi/spec v0.19.2 // indirect
28+
github.com/gogo/protobuf v1.2.1 // indirect
29+
github.com/google/btree v1.0.0 // indirect
30+
github.com/google/gofuzz v1.0.0 // indirect
31+
github.com/googleapis/gnostic v0.3.0 // indirect
32+
github.com/gorilla/mux v1.7.2
3333
github.com/gorilla/websocket v1.4.0
34-
github.com/gregjones/httpcache v0.0.0-20181110185634-c63ab54fda8f // indirect
35-
github.com/imdario/mergo v0.3.6 // indirect
36-
github.com/inconshreveable/mousetrap v1.0.0 // indirect
37-
github.com/json-iterator/go v1.1.5 // indirect
38-
github.com/kr/pretty v0.1.0 // indirect
39-
github.com/mitchellh/go-homedir v1.0.0
40-
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
34+
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
35+
github.com/imdario/mergo v0.3.7 // indirect
36+
github.com/json-iterator/go v1.1.6 // indirect
37+
github.com/mitchellh/go-homedir v1.1.0
4138
github.com/modern-go/reflect2 v1.0.1 // indirect
4239
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
4340
github.com/pkg/errors v0.8.1
44-
github.com/spf13/cobra v0.0.3
45-
github.com/spf13/pflag v1.0.3 // indirect
41+
github.com/spf13/cobra v0.0.5
4642
github.com/stretchr/testify v1.3.0
4743
github.com/tcnksm/go-input v0.0.0-20180404061846-548a7d7a8ee8
48-
github.com/ugorji/go/codec v0.0.0-20181209151446-772ced7fd4c2
44+
github.com/ugorji/go/codec v1.1.5-pre
4945
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca
50-
golang.org/x/crypto v0.0.0-20190103213133-ff983b9c42bc // indirect
51-
golang.org/x/net v0.0.0-20190110200230-915654e7eabc // indirect
52-
golang.org/x/oauth2 v0.0.0-20190110195249-fd3eaa146cbb // indirect
53-
golang.org/x/sys v0.0.0-20190109145017-48ac38b7c8cb // indirect
54-
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c // indirect
55-
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
46+
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 // indirect
47+
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect
5648
gopkg.in/inf.v0 v0.9.1 // indirect
5749
gopkg.in/robfig/cron.v2 v2.0.0-20150107220207-be2e0b0deed5
5850
k8s.io/api v0.0.0-20181204000039-89a74a8d264d
5951
k8s.io/apimachinery v0.0.0-20181127025237-2b1284ed4c93
6052
k8s.io/client-go v10.0.0+incompatible
61-
k8s.io/klog v0.1.0 // indirect
62-
k8s.io/kube-openapi v0.0.0-20181114233023-0317810137be // indirect
53+
k8s.io/klog v0.3.0 // indirect
54+
k8s.io/kube-openapi v0.0.0-20190603182131-db7b694dc208 // indirect
6355
sigs.k8s.io/yaml v1.1.0 // indirect
6456
)

0 commit comments

Comments
 (0)