Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Go to 1.14.1 #1543

Merged
merged 3 commits into from
Apr 3, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.12.15
FROM golang:1.14.1

RUN apt-get update && apt-get install -y \
curl \
Expand Down
4 changes: 2 additions & 2 deletions buildscripts/circle-validate-vendor.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash

go_version=1.12.15
go_version=1.14.1

docker run --rm --env GO111MODULE=on -w /notary --volume ${PWD}:/notary \
golang:${go_version}-alpine \
sh -c "apk update && apk add bash git && buildscripts/validate-vendor.sh"
sh -c "apk update && apk add bash git && buildscripts/validate-vendor.sh"
2 changes: 1 addition & 1 deletion escrow.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.12.15-alpine
FROM golang:1.14.1-alpine

ENV NOTARYPKG github.com/theupdateframework/notary
ENV GO111MODULE=on
Expand Down
2 changes: 1 addition & 1 deletion server.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.12.15-alpine
FROM golang:1.14.1-alpine

RUN apk add --update git gcc libc-dev

Expand Down
2 changes: 1 addition & 1 deletion server.minimal.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.12.15-alpine AS build-env
FROM golang:1.14.1-alpine AS build-env

RUN apk add --update git gcc libc-dev

Expand Down
2 changes: 1 addition & 1 deletion signer.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.12.15-alpine
FROM golang:1.14.1-alpine

RUN apk add --update git gcc libc-dev

Expand Down
2 changes: 1 addition & 1 deletion signer.minimal.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.12.15-alpine AS build-env
FROM golang:1.14.1-alpine AS build-env

RUN apk add --update git gcc libc-dev

Expand Down
4 changes: 2 additions & 2 deletions storage/httpstore_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ func TestNetworkError(t *testing.T) {
Err: errors.New("abc%3Adef%3Aghi"),
}
networkErr := NetworkError{Wrapped: err}
require.Equal(t, http.MethodGet+" https://auth.docker.io: abc:def:ghi", networkErr.Error())
require.Equal(t, http.MethodGet+" \"https://auth.docker.io\": abc:def:ghi", networkErr.Error())
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wondering why success in the past?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah these were weird it looks like the error message printing changed in Go 1.14, I mean checking exact error messages is always risky.


// expect QueryUnescape error because the last '%' is not
// followed by two hexadecimal digits
Expand All @@ -403,7 +403,7 @@ func TestNetworkError(t *testing.T) {
Err: errors.New("abc%3Adef%GAghi"),
}
networkErr2 := NetworkError{Wrapped: err2}
require.Equal(t, http.MethodGet+" https://auth.docker.io: abc%3Adef%GAghi", networkErr2.Error())
require.Equal(t, http.MethodGet+" \"https://auth.docker.io\": abc%3Adef%GAghi", networkErr2.Error())

err3 := errors.New("CPU usage 90%3A")
networkErr3 := NetworkError{Wrapped: err3}
Expand Down

This file was deleted.

This file was deleted.

74 changes: 0 additions & 74 deletions vendor/github.com/lib/pq/oid/gen.go

This file was deleted.

Loading