From af0e699d3a477cb4260ff3f5210b351da4994e32 Mon Sep 17 00:00:00 2001
From: xytan0056 <48696694+xytan0056@users.noreply.github.com>
Date: Wed, 1 Apr 2020 16:02:25 -0700
Subject: [PATCH] update go version in configs (#1594)

Co-authored-by: Marwan Sulaiman <marwan.sameer@gmail.com>
Co-authored-by: Aaron Schlesinger <70865+arschles@users.noreply.github.com>
---
 Makefile           | 2 +-
 docker-compose.yml | 6 +++---
 go.mod             | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 2730a530..aca56a16 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ VERSION = "unset"
 DATE=$(shell date -u +%Y-%m-%d-%H:%M:%S-%Z)
 
 ifndef GOLANG_VERSION
-override GOLANG_VERSION = 1.13
+override GOLANG_VERSION = 1.14
 endif
 
 .PHONY: build
diff --git a/docker-compose.yml b/docker-compose.yml
index 15c29aaf..88bf8301 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,7 @@ services:
       context: .
       dockerfile: cmd/proxy/Dockerfile
       args:
-        GOLANG_VERSION: 1.13
+        GOLANG_VERSION: 1.14
     environment:
       - ATHENS_MONGO_STORAGE_URL=mongodb://mongo:27017
       - TIMEOUT=20 # in case the mongo dependency takes longer to start up
@@ -20,7 +20,7 @@ services:
       context: .
       dockerfile: Dockerfile.test
       args:
-        GOLANG_VERSION: 1.13
+        GOLANG_VERSION: 1.14
     command: ["./scripts/test_unit.sh"]
     environment:
       - GO_ENV=test
@@ -36,7 +36,7 @@ services:
       context: .
       dockerfile: Dockerfile.test
       args:
-        GOLANG_VERSION: 1.13
+        GOLANG_VERSION: 1.14
     command: ["./scripts/test_e2e.sh"]
   azurite:
     image: arafato/azurite:2.6.5
diff --git a/go.mod b/go.mod
index cc0ced73..c45b96ba 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/gomods/athens
 
-go 1.12
+go 1.14
 
 require (
 	cloud.google.com/go/bigquery v1.4.0 // indirect