From 94e5cb7576a1adf4f860d10691dd538f1c02cde4 Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Sun, 8 Sep 2019 16:44:15 -0700 Subject: [PATCH] Migrate to go1.13 to avail all new features (#8203) Read more https://blog.golang.org/go1.13 --- .travis.yml | 6 ++---- Dockerfile | 2 +- Dockerfile.release | 2 +- Dockerfile.simpleci | 3 +-- Makefile | 30 +++++++++++++++--------------- README.md | 2 +- buildscripts/checkdeps.sh | 2 +- buildscripts/cross-compile.sh | 1 - buildscripts/go-coverage.sh | 2 +- buildscripts/verify-build.sh | 1 - go.mod | 4 +--- go.sum | 8 +++++--- main.go | 2 +- mint/build/aws-sdk-go/install.sh | 2 +- mint/build/healthcheck/install.sh | 2 +- mint/build/minio-go/install.sh | 2 +- mint/build/security/install.sh | 2 +- mint/build/worm/install.sh | 4 ++-- mint/mint.sh | 2 -- mint/preinstall.sh | 2 +- staticcheck.conf | 2 +- 21 files changed, 38 insertions(+), 45 deletions(-) diff --git a/.travis.yml b/.travis.yml index 351049d1f..da0e0cf1f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,8 +26,7 @@ matrix: - ARCH=x86_64 - CGO_ENABLED=0 - GO111MODULE=on - - GOPROXY=https://proxy.golang.org - go: 1.12.x + go: 1.13.x script: - make - diff -au <(gofmt -s -d cmd) <(printf "") @@ -45,8 +44,7 @@ matrix: - ARCH=x86_64 - CGO_ENABLED=0 - GO111MODULE=on - - GOPROXY=https://proxy.golang.org - go: 1.12.x + go: 1.13.x script: - go build --ldflags="$(go run buildscripts/gen-ldflags.go)" -o %GOPATH%\bin\minio.exe - bash buildscripts/go-coverage.sh diff --git a/Dockerfile b/Dockerfile index 13152332a..0164cd73b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.12-alpine +FROM golang:1.13-alpine LABEL maintainer="MinIO Inc " diff --git a/Dockerfile.release b/Dockerfile.release index 2c86b1e3b..5b65d92d5 100644 --- a/Dockerfile.release +++ b/Dockerfile.release @@ -1,4 +1,4 @@ -FROM golang:1.12-alpine +FROM golang:1.13-alpine ENV GOPATH /go ENV CGO_ENABLED 0 diff --git a/Dockerfile.simpleci b/Dockerfile.simpleci index 2c8bba41a..4e6f0291c 100644 --- a/Dockerfile.simpleci +++ b/Dockerfile.simpleci @@ -1,14 +1,13 @@ #------------------------------------------------------------- # Stage 1: Build and Unit tests #------------------------------------------------------------- -FROM golang:1.12 +FROM golang:1.13 COPY . /go/src/github.com/minio/minio WORKDIR /go/src/github.com/minio/minio RUN apt-get update && apt-get install -y jq ENV GO111MODULE=on -ENV GOPROXY=https://proxy.golang.org RUN git config --global http.cookiefile /gitcookie/.gitcookie diff --git a/Makefile b/Makefile index a24462db4..7c492f1e3 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ checks: getdeps: @mkdir -p ${GOPATH}/bin @which golint 1>/dev/null || (echo "Installing golint" && go get -u golang.org/x/lint/golint) - @which staticcheck 1>/dev/null || (echo "Installing staticcheck" && wget --quiet -O ${GOPATH}/bin/staticcheck https://github.com/dominikh/go-tools/releases/download/2019.1/staticcheck_${GOOS}_amd64 && chmod +x ${GOPATH}/bin/staticcheck) + @which staticcheck 1>/dev/null || (echo "Installing staticcheck" && wget --quiet https://github.com/dominikh/go-tools/releases/download/2019.2.3/staticcheck_${GOOS}_amd64.tar.gz && tar xf staticcheck_${GOOS}_amd64.tar.gz && mv staticcheck/staticcheck ${GOPATH}/bin/staticcheck && chmod +x ${GOPATH}/bin/staticcheck && rm -f staticcheck_${GOOS}_amd64.tar.gz && rm -rf staticcheck) @which misspell 1>/dev/null || (echo "Installing misspell" && wget --quiet https://github.com/client9/misspell/releases/download/v0.3.4/misspell_0.3.4_${GOOSALT}_64bit.tar.gz && tar xf misspell_0.3.4_${GOOSALT}_64bit.tar.gz && mv misspell ${GOPATH}/bin/misspell && chmod +x ${GOPATH}/bin/misspell && rm -f misspell_0.3.4_${GOOSALT}_64bit.tar.gz) crosscompile: @@ -30,35 +30,35 @@ verifiers: getdeps vet fmt lint staticcheck spelling vet: @echo "Running $@" - @GOPROXY=https://proxy.golang.org GO111MODULE=on go vet github.com/minio/minio/... + @GO111MODULE=on go vet github.com/minio/minio/... fmt: @echo "Running $@" - @GOPROXY=https://proxy.golang.org GO111MODULE=on gofmt -d cmd/ - @GOPROXY=https://proxy.golang.org GO111MODULE=on gofmt -d pkg/ + @GO111MODULE=on gofmt -d cmd/ + @GO111MODULE=on gofmt -d pkg/ lint: @echo "Running $@" - @GOPROXY=https://proxy.golang.org GO111MODULE=on ${GOPATH}/bin/golint -set_exit_status github.com/minio/minio/cmd/... - @GOPROXY=https://proxy.golang.org GO111MODULE=on ${GOPATH}/bin/golint -set_exit_status github.com/minio/minio/pkg/... + @GO111MODULE=on ${GOPATH}/bin/golint -set_exit_status github.com/minio/minio/cmd/... + @GO111MODULE=on ${GOPATH}/bin/golint -set_exit_status github.com/minio/minio/pkg/... staticcheck: @echo "Running $@" - @GOPROXY=https://proxy.golang.org GO111MODULE=on ${GOPATH}/bin/staticcheck github.com/minio/minio/cmd/... - @GOPROXY=https://proxy.golang.org GO111MODULE=on ${GOPATH}/bin/staticcheck github.com/minio/minio/pkg/... + @GO111MODULE=on ${GOPATH}/bin/staticcheck github.com/minio/minio/cmd/... + @GO111MODULE=on ${GOPATH}/bin/staticcheck github.com/minio/minio/pkg/... spelling: - @GOPROXY=https://proxy.golang.org GO111MODULE=on ${GOPATH}/bin/misspell -locale US -error `find cmd/` - @GOPROXY=https://proxy.golang.org GO111MODULE=on ${GOPATH}/bin/misspell -locale US -error `find pkg/` - @GOPROXY=https://proxy.golang.org GO111MODULE=on ${GOPATH}/bin/misspell -locale US -error `find docs/` - @GOPROXY=https://proxy.golang.org GO111MODULE=on ${GOPATH}/bin/misspell -locale US -error `find buildscripts/` - @GOPROXY=https://proxy.golang.org GO111MODULE=on ${GOPATH}/bin/misspell -locale US -error `find dockerscripts/` + @GO111MODULE=on ${GOPATH}/bin/misspell -locale US -error `find cmd/` + @GO111MODULE=on ${GOPATH}/bin/misspell -locale US -error `find pkg/` + @GO111MODULE=on ${GOPATH}/bin/misspell -locale US -error `find docs/` + @GO111MODULE=on ${GOPATH}/bin/misspell -locale US -error `find buildscripts/` + @GO111MODULE=on ${GOPATH}/bin/misspell -locale US -error `find dockerscripts/` # Builds minio, runs the verifiers then runs the tests. check: test test: verifiers build @echo "Running unit tests" - @GOPROXY=https://proxy.golang.org GO111MODULE=on CGO_ENABLED=0 go test -tags kqueue ./... 1>/dev/null + @GO111MODULE=on CGO_ENABLED=0 go test -tags kqueue ./... 1>/dev/null verify: build @echo "Verifying build" @@ -71,7 +71,7 @@ coverage: build # Builds minio locally. build: checks @echo "Building minio binary to './minio'" - @GOPROXY=https://proxy.golang.org GO111MODULE=on GOFLAGS="" CGO_ENABLED=0 go build -tags kqueue --ldflags $(BUILD_LDFLAGS) -o $(PWD)/minio 1>/dev/null + @GO111MODULE=on CGO_ENABLED=0 go build -tags kqueue --ldflags $(BUILD_LDFLAGS) -o $(PWD)/minio 1>/dev/null docker: build @docker build -t $(TAG) . -f Dockerfile.dev diff --git a/README.md b/README.md index 4746e32f2..7de394383 100644 --- a/README.md +++ b/README.md @@ -91,7 +91,7 @@ service minio start Source installation is only intended for developers and advanced users. If you do not have a working Golang environment, please follow [How to install Golang](https://golang.org/doc/install). Minimum version required is [go1.12](https://golang.org/dl/#stable) ```sh -GOPROXY=https://proxy.golang.org GO111MODULE=on go get github.com/minio/minio +GO111MODULE=on go get github.com/minio/minio ``` ## Allow port access for Firewalls diff --git a/buildscripts/checkdeps.sh b/buildscripts/checkdeps.sh index 722d6dbf8..7907f5951 100644 --- a/buildscripts/checkdeps.sh +++ b/buildscripts/checkdeps.sh @@ -21,7 +21,7 @@ _init() { ## Minimum required versions for build dependencies GIT_VERSION="1.0" - GO_VERSION="1.12" + GO_VERSION="1.13" OSX_VERSION="10.8" KNAME=$(uname -s) ARCH=$(uname -m) diff --git a/buildscripts/cross-compile.sh b/buildscripts/cross-compile.sh index a094a6511..edf1786b9 100755 --- a/buildscripts/cross-compile.sh +++ b/buildscripts/cross-compile.sh @@ -23,7 +23,6 @@ function _build() { export GOOS=$os export GOARCH=$arch export GO111MODULE=on - export GOPROXY=https://proxy.golang.org go build -tags kqueue -o /dev/null } diff --git a/buildscripts/go-coverage.sh b/buildscripts/go-coverage.sh index 67599fd02..5efcfbb03 100755 --- a/buildscripts/go-coverage.sh +++ b/buildscripts/go-coverage.sh @@ -2,4 +2,4 @@ set -e -GOPROXY=https://proxy.golang.org GO111MODULE=on CGO_ENABLED=0 go test -v -coverprofile=coverage.txt -covermode=atomic ./... +GO111MODULE=on CGO_ENABLED=0 go test -v -coverprofile=coverage.txt -covermode=atomic ./... diff --git a/buildscripts/verify-build.sh b/buildscripts/verify-build.sh index fc147a917..fd06a7e61 100755 --- a/buildscripts/verify-build.sh +++ b/buildscripts/verify-build.sh @@ -33,7 +33,6 @@ export ACCESS_KEY="minio" export SECRET_KEY="minio123" export ENABLE_HTTPS=0 export GO111MODULE=on -export GOPROXY=https://proxy.golang.org MINIO_CONFIG_DIR="$WORK_DIR/.minio" MINIO=( "$PWD/minio" --config-dir "$MINIO_CONFIG_DIR" ) diff --git a/go.mod b/go.mod index 74353bac8..3977787c0 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/minio/minio -go 1.12 +go 1.13 require ( cloud.google.com/go v0.37.2 @@ -102,5 +102,3 @@ replace github.com/eapache/queue => github.com/eapache/queue v1.1.0 replace github.com/mattn/go-runewidth => github.com/mattn/go-runewidth v0.0.4 replace github.com/mitchellh/mapstructure => github.com/mitchellh/mapstructure v1.1.2 - -replace git.apache.org/thrift.git => github.com/apache/thrift v0.12.0 diff --git a/go.sum b/go.sum index 16163d3cf..7ea9e8ab8 100644 --- a/go.sum +++ b/go.sum @@ -9,6 +9,9 @@ contrib.go.opencensus.io/exporter/ocagent v0.4.10/go.mod h1:ueLzZcP7LPhPulEBukGn contrib.go.opencensus.io/exporter/ocagent v0.5.0 h1:TKXjQSRS0/cCDrP7KvkgU6SmILtF/yV2TOs/02K/WZQ= contrib.go.opencensus.io/exporter/ocagent v0.5.0/go.mod h1:ImxhfLRpxoYiSq891pBrLVhN+qmP8BTVvdH2YLs7Gl0= contrib.go.opencensus.io/exporter/stackdriver v0.0.0-20180919222851-d1e19f5c23e9/go.mod h1:hNe5qQofPbg6bLQY5wHCvQ7o+2E5P8PkegEuQ+MyRw0= +git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= +git.apache.org/thrift.git v0.12.0 h1:CMxsZlAmxKs+VAZMlDDL0wXciMblJcutQbEe3A9CYUM= +git.apache.org/thrift.git v0.12.0/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= github.com/Azure/azure-sdk-for-go v26.4.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-sdk-for-go v27.0.0+incompatible h1:JknnG+RYTnwzpi+YuQ04/dAWIssbubSRD8arN78I+Qo= github.com/Azure/azure-sdk-for-go v27.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= @@ -41,7 +44,6 @@ github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20170925032315-6fe16293d6b7/go.mod h1 github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190307165228-86c17b95fcd5 h1:nWDRPCyCltiTsANwC/n3QZH7Vww33Npq9MKqlwRzI/c= github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190307165228-86c17b95fcd5/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8= github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= -github.com/apache/thrift v0.12.0 h1:pODnxUFNcjP9UTLZGTdeh+j16A8lJbRvD3rOtrk/7bs= github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/araddon/gou v0.0.0-20190110011759-c797efecbb61/go.mod h1:ikc1XA58M+Rx7SEbf0bLJCfBkwayZ8T5jBo5FXK8Uz8= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= @@ -222,7 +224,6 @@ github.com/gorilla/mux v1.7.0/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2z github.com/gorilla/rpc v0.0.0-20160517062331-bd3317b8f670/go.mod h1:V4h9r+4sF5HnzqbwIez0fKSpANP0zlYd3qR7p36jkTQ= github.com/gorilla/rpc v1.2.0 h1:WvvdC2lNeT1SP32zrIce5l0ECBfbAlmrmSBsuc57wfk= github.com/gorilla/rpc v1.2.0/go.mod h1:V4h9r+4sF5HnzqbwIez0fKSpANP0zlYd3qR7p36jkTQ= -github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM= github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= @@ -324,7 +325,6 @@ github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5i github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= -github.com/json-iterator/go v1.1.6 h1:MrUvLMLTMxbqFJ9kzlvat/rYZqZnW3u4wkLzWTaFwKs= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.7 h1:KfgG9LzI+pYjr4xvmz/5H4FXjokeP+rlHLhv3iH62Fo= github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= @@ -396,6 +396,7 @@ github.com/minio/cli v1.20.0/go.mod h1:bYxnK0uS629N3Bq+AOZZ+6lwF77Sodk4+UL9vNuXh github.com/minio/cli v1.21.0 h1:8gE8iZc0ONOhHy/T28tCsNew5f5VzWU558U9Myjfq50= github.com/minio/cli v1.21.0/go.mod h1:bYxnK0uS629N3Bq+AOZZ+6lwF77Sodk4+UL9vNuXhOY= github.com/minio/dsync v0.0.0-20190104003057-61c41ffdeea2/go.mod h1:eLQe3mXL0h02kNpPtBJiLr1fIEIJftgXRAjncjQbxJo= +github.com/minio/dsync v1.0.0 h1:l6pQgUPBM41idlR0UOcpAP+EYim9MCwIAUh6sQQI1gk= github.com/minio/dsync v1.0.0/go.mod h1:eLQe3mXL0h02kNpPtBJiLr1fIEIJftgXRAjncjQbxJo= github.com/minio/dsync/v2 v2.0.0 h1:p353BZ9od4xgHSXHn5GQ9V3WcnsxqH6aaShy0jDSX54= github.com/minio/dsync/v2 v2.0.0/go.mod h1:kxZSSQoDZa5OAsfgM8JJ0iRQOkGsg0op9unAnQVMm7o= @@ -612,6 +613,7 @@ github.com/ugorji/go v0.0.0-20180628102755-7d51bbe6161d/go.mod h1:hnLbHMwcvSihnD github.com/ugorji/go v1.1.2/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ= github.com/ugorji/go v1.1.4 h1:j4s+tAvLfL3bZyefP2SEWmhBzmuIlH/eqNuPdFPgngw= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= +github.com/ugorji/go/codec v0.0.0-20190320090025-2dc34c0b8780 h1:vG/gY/PxA3v3l04qxe3tDjXyu3bozii8ulSlIPOYKhI= github.com/ugorji/go/codec v0.0.0-20190320090025-2dc34c0b8780/go.mod h1:iT03XoTwV7xq/+UGwKO3UbC1nNNlopQiY61beSdrtOA= github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a h1:0R4NLDRDZX6JcmhJgXi5E4b8Wg84ihbmUKp/GvSPEzc= github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio= diff --git a/main.go b/main.go index 4f1a3eb0d..dbbe3ccb7 100644 --- a/main.go +++ b/main.go @@ -1,4 +1,4 @@ -// +build go1.12 +// +build go1.13 /* * MinIO Cloud Storage, (C) 2016, 2017, 2018 MinIO, Inc. diff --git a/mint/build/aws-sdk-go/install.sh b/mint/build/aws-sdk-go/install.sh index 0c5529078..d73162840 100755 --- a/mint/build/aws-sdk-go/install.sh +++ b/mint/build/aws-sdk-go/install.sh @@ -16,4 +16,4 @@ # test_run_dir="$MINT_RUN_CORE_DIR/aws-sdk-go" -GOPROXY=https://proxy.golang.org GO111MODULE=on go build -o "$test_run_dir/aws-sdk-go" "$test_run_dir/quick-tests.go" +GO111MODULE=on go build -o "$test_run_dir/aws-sdk-go" "$test_run_dir/quick-tests.go" diff --git a/mint/build/healthcheck/install.sh b/mint/build/healthcheck/install.sh index 906a62e67..71ffe4823 100755 --- a/mint/build/healthcheck/install.sh +++ b/mint/build/healthcheck/install.sh @@ -16,4 +16,4 @@ # test_run_dir="$MINT_RUN_CORE_DIR/healthcheck" -GOPROXY=https://proxy.golang.org GO111MODULE=on go build -o "$test_run_dir/healthcheck" "$test_run_dir/healthcheck.go" +GO111MODULE=on go build -o "$test_run_dir/healthcheck" "$test_run_dir/healthcheck.go" diff --git a/mint/build/minio-go/install.sh b/mint/build/minio-go/install.sh index 1debb922b..5e3005199 100755 --- a/mint/build/minio-go/install.sh +++ b/mint/build/minio-go/install.sh @@ -23,5 +23,5 @@ fi test_run_dir="$MINT_RUN_CORE_DIR/minio-go" (git clone https://github.com/minio/minio-go && cd minio-go && git checkout --quiet "tags/$MINIO_GO_VERSION") -GOPROXY=https://proxy.golang.org GO111MODULE=on CGO_ENABLED=0 go build -o "$test_run_dir/minio-go" "minio-go/functional_tests.go" +GO111MODULE=on CGO_ENABLED=0 go build -o "$test_run_dir/minio-go" "minio-go/functional_tests.go" rm -rf minio-go diff --git a/mint/build/security/install.sh b/mint/build/security/install.sh index e45c6789a..a517bfb18 100755 --- a/mint/build/security/install.sh +++ b/mint/build/security/install.sh @@ -16,4 +16,4 @@ # test_run_dir="$MINT_RUN_CORE_DIR/security" -GOPROXY=https://proxy.golang.org GO111MODULE=on go build -o "$test_run_dir/tls-tests" "$test_run_dir/tls-tests.go" +GO111MODULE=on go build -o "$test_run_dir/tls-tests" "$test_run_dir/tls-tests.go" diff --git a/mint/build/worm/install.sh b/mint/build/worm/install.sh index 49f3191bf..5da4aa742 100755 --- a/mint/build/worm/install.sh +++ b/mint/build/worm/install.sh @@ -1,6 +1,6 @@ #!/bin/bash -e # -# Mint (C) 2017 Minio, Inc. +# Mint (C) 2017-2019 Minio, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -16,4 +16,4 @@ # test_run_dir="$MINT_RUN_CORE_DIR/worm" -GOPROXY=https://proxy.golang.org GO111MODULE=on CGO_ENABLED=0 go build -o "$test_run_dir/worm" "$test_run_dir/quick-worm-tests.go" +GO111MODULE=on CGO_ENABLED=0 go build -o "$test_run_dir/worm" "$test_run_dir/quick-worm-tests.go" diff --git a/mint/mint.sh b/mint/mint.sh index 5d9e9972c..953c3f096 100755 --- a/mint/mint.sh +++ b/mint/mint.sh @@ -22,7 +22,6 @@ SERVER_REGION=${SERVER_REGION:-us-east-1} ENABLE_HTTPS=${ENABLE_HTTPS:-0} ENABLE_VIRTUAL_STYLE=${ENABLE_VIRTUAL_STYLE:-0} GO111MODULE=on -GOPROXY=https://proxy.golang.org if [ -z "$SERVER_ENDPOINT" ]; then SERVER_ENDPOINT="play.minio.io:9000" @@ -138,7 +137,6 @@ function main() export SERVER_REGION export ENABLE_VIRTUAL_STYLE export GO111MODULE - export GOPROXY echo "Running with" echo "SERVER_ENDPOINT: $SERVER_ENDPOINT" diff --git a/mint/preinstall.sh b/mint/preinstall.sh index f3fbd600e..672132e2b 100755 --- a/mint/preinstall.sh +++ b/mint/preinstall.sh @@ -32,7 +32,7 @@ rm -f packages-microsoft-prod.deb $APT update # download and install golang -GO_VERSION="1.12.5" +GO_VERSION="1.13" GO_INSTALL_PATH="/usr/local" download_url="https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" if ! $WGET --output-document=- "$download_url" | tar -C "${GO_INSTALL_PATH}" -zxf -; then diff --git a/staticcheck.conf b/staticcheck.conf index 3d47c8b2a..c01c87fca 100644 --- a/staticcheck.conf +++ b/staticcheck.conf @@ -1 +1 @@ -checks = ["all", "-ST1005", "-ST1000", "-SA4000", "-SA9004", "-SA1019", "-SA1008"] +checks = ["all", "-ST1005", "-ST1000", "-SA4000", "-SA9004", "-SA1019", "-SA1008", "-U1000"]