Skip to content

Commit

Permalink
Merge pull request #15 from puellanivis/patch/update-to-go1.14
Browse files Browse the repository at this point in the history
Update to go1.14
  • Loading branch information
puellanivis authored Mar 2, 2020
2 parents 1eedbf8 + dead6e5 commit 5f5d49d
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
10 changes: 6 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
module github.com/puellanivis/breton

go 1.13
go 1.14

require (
github.com/aws/aws-sdk-go v1.29.4
github.com/aws/aws-sdk-go v1.29.14
github.com/golang/protobuf v1.3.4
github.com/pkg/errors v0.9.1
github.com/pkg/sftp v1.11.0
github.com/prometheus/client_golang v1.4.1
golang.org/x/crypto v0.0.0-20200214034016-1d94cc7ab1c6
golang.org/x/net v0.0.0-20200202094626-16171245cfb2
golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d
golang.org/x/net v0.0.0-20200301022130-244492dfa37a
golang.org/x/text v0.3.2
google.golang.org/grpc v1.27.1
)
4 changes: 2 additions & 2 deletions masher/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This docker image builds upon the golang docker image to support a more automated process for building
# golang files.
FROM golang:1.13
FROM golang:1.14
MAINTAINER Cassondra Foesch <[email protected]>

# Setup various environment and argument settings which define the building environment.
Expand Down Expand Up @@ -29,7 +29,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
# However, I don’t think it makes sense to use older version, better to be able to advance as it releases outselves.
RUN mkdir -p /usr/bin && \
cd /usr && \
curl -sS -L https://github.com/google/protobuf/releases/download/v3.11.2/protoc-3.11.2-linux-x86_64.zip | \
curl -sS -L https://github.com/google/protobuf/releases/download/v3.11.4/protoc-3.11.4-linux-x86_64.zip | \
bsdtar -xvf- --exclude=readme.txt && \
chmod 755 /usr/bin/protoc

Expand Down
2 changes: 1 addition & 1 deletion masher/masher
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ if which go > /dev/null 2>&1 ; then
if [[ "$LINUX" != "--deb" ]]; then
echo Found Local Go Version: $GO_VERSION
case $GO_VERSION in
1.13|1.13.*|1.13[a-z]*)
1.14|1.14.*|1.14[a-z]*)
LOCALTEST="true"
esac
fi
Expand Down

0 comments on commit 5f5d49d

Please sign in to comment.