From 73f7a98590a2c477e426df851c875845754c4e48 Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Fri, 6 Apr 2018 11:07:39 -0700 Subject: [PATCH] Enable go1.10.1 version (#5666) --- .travis.yml | 2 +- Dockerfile | 2 +- Dockerfile.dev | 2 +- Dockerfile.release | 2 +- appveyor.yml | 2 +- buildscripts/checkdeps.sh | 2 +- cmd/object-api-utils_test.go | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 68127dc8d..db4f2f3bd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,4 +31,4 @@ after_success: - bash <(curl -s https://codecov.io/bash) go: -- 1.9.4 +- '1.10.1' diff --git a/Dockerfile b/Dockerfile index 05d39c657..520b6c956 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.9.4-alpine3.6 +FROM golang:1.10.1-alpine3.7 MAINTAINER Minio Inc diff --git a/Dockerfile.dev b/Dockerfile.dev index e87fe8233..9c7c7fda1 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -1,4 +1,4 @@ -FROM golang:1.9.4-alpine3.6 +FROM golang:1.10.1-alpine3.7 MAINTAINER Minio Inc diff --git a/Dockerfile.release b/Dockerfile.release index f50c085f5..1e5f57572 100644 --- a/Dockerfile.release +++ b/Dockerfile.release @@ -1,4 +1,4 @@ -FROM alpine:3.6 +FROM alpine:3.7 MAINTAINER Minio Inc diff --git a/appveyor.yml b/appveyor.yml index c358484f6..7e8b0fb2a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,7 +12,7 @@ clone_folder: c:\gopath\src\github.com\minio\minio # Environment variables environment: GOPATH: c:\gopath - GOROOT: c:\go19 + GOROOT: c:\go # scripts that run after cloning repository install: diff --git a/buildscripts/checkdeps.sh b/buildscripts/checkdeps.sh index 1aed72f3c..ec8cb7130 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.9.4" + GO_VERSION="1.10.1" OSX_VERSION="10.8" KNAME=$(uname -s) ARCH=$(uname -m) diff --git a/cmd/object-api-utils_test.go b/cmd/object-api-utils_test.go index 2918ace65..b9d8781b6 100644 --- a/cmd/object-api-utils_test.go +++ b/cmd/object-api-utils_test.go @@ -139,7 +139,7 @@ func TestGetCompleteMultipartMD5(t *testing.T) { expectedErr string }{ // Wrong MD5 hash string - {[]CompletePart{{ETag: "wrong-md5-hash-string"}}, "", "encoding/hex: odd length hex string"}, + {[]CompletePart{{ETag: "wrong-md5-hash-string"}}, "", "encoding/hex: invalid byte: U+0077 'w'"}, // Single CompletePart with valid MD5 hash string. {[]CompletePart{{ETag: "cf1f738a5924e645913c984e0fe3d708"}}, "10dc1617fbcf0bd0858048cb96e6bd77-1", ""},