From 53232f726dfd5fe055c4f70a53dac098fb0db8e0 Mon Sep 17 00:00:00 2001
From: Ted Wexler <ted@stuckinacan.com>
Date: Wed, 26 Feb 2020 18:53:12 -0500
Subject: [PATCH 1/2] Update builds for Go 1.14 (#1558)

* Update .drone.yml for Go 1.14

* Update appveyor.yml for Go 1.14

* Update Dockerfile.test for Go 1.14

* Update Dockerfile for Go 1.14

* Update scripts/build-image/Dockerfile
---
 .drone.yml                     | 4 ++--
 Dockerfile.test                | 2 +-
 appveyor.yml                   | 2 +-
 cmd/proxy/Dockerfile           | 2 +-
 scripts/build-image/Dockerfile | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 66f9e825..0b09eaa4 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -4,7 +4,7 @@ name: default
 
 steps:
 - name: download-dependencies
-  image: golang:1.13
+  image: golang:1.14
   commands:
     # wait for services to be ready.
     - cd scripts/liveness_probe
@@ -20,7 +20,7 @@ steps:
     path: /go
 
 - name: build
-  image: golang:1.13
+  image: golang:1.14
   commands:
 
   # build
diff --git a/Dockerfile.test b/Dockerfile.test
index 9df0a7cc..c75ca4fe 100644
--- a/Dockerfile.test
+++ b/Dockerfile.test
@@ -1,4 +1,4 @@
-ARG GOLANG_VERSION=1.12
+ARG GOLANG_VERSION=1.14
 FROM golang:$GOLANG_VERSION
 
 RUN echo $GOLANG_VERSION
diff --git a/appveyor.yml b/appveyor.yml
index 5159492d..2da8d497 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,7 +8,7 @@ environment:
   GOPROXY: https://proxy.golang.org
   SKIP_UNTIL_113: true
 
-stack: go 1.13
+stack: go 1.14
 
 test_script:
   - go test ./...
diff --git a/cmd/proxy/Dockerfile b/cmd/proxy/Dockerfile
index b922042f..5ffef06a 100644
--- a/cmd/proxy/Dockerfile
+++ b/cmd/proxy/Dockerfile
@@ -5,7 +5,7 @@
 # You can override the Go version used to build the image.
 # See project Makefile if using make.
 # See docker --build-arg if building directly.
-ARG GOLANG_VERSION=1.13
+ARG GOLANG_VERSION=1.14
 FROM golang:${GOLANG_VERSION}-alpine AS builder
 
 WORKDIR $GOPATH/src/github.com/gomods/athens
diff --git a/scripts/build-image/Dockerfile b/scripts/build-image/Dockerfile
index a32cf423..b33d7caf 100644
--- a/scripts/build-image/Dockerfile
+++ b/scripts/build-image/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.12-stretch
+FROM golang:1.14-stretch
 
 WORKDIR /tmp
 

From 5ea57ccd7e5afce88cad79e9df6bb7b87adc52ae Mon Sep 17 00:00:00 2001
From: Aaron Schlesinger <70865+arschles@users.noreply.github.com>
Date: Wed, 26 Feb 2020 16:43:26 -0800
Subject: [PATCH 2/2] Adding more documentation to the Pull Request template
 (#1552)

* Adding more documentation to the Pull Request template

Including how the WIP bot factors into your workflow

Fixes https://github.com/gomods/athens/issues/792
---
 .github/PULL_REQUEST_TEMPLATE.md | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 2717e793..cd68367e 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,13 +1,25 @@
+<!-- 
+    Welcome, Athenian! Can you do us two quick favors before you submit your PR?
+    
+    1. Briefly fill out the sections below. It will make it easy for us to review your code
+    2. Put "[WIP]" at the beginning of your PR title if you're not ready to have this merged yet (we have a bot that will tell everyone that it's a work in progress)
+-->
 
-**What is the problem I am trying to address?**
+## What is the problem I am trying to address?
 
 Describe the issue you have been trying to solve.
 
-**How is the fix applied?**
+## How is the fix applied?
 
 Mention briefly how you have applied the fix.
 
-**Mention the issue number it fixes or add the details of the changes if it doesn't have a specific issue.**
+## What GitHub issue(s) does this PR fix or close?
+
+<!--
+    If it doesn't fix any issues, that's ok. You can leave this blank.
+
+    If it does, then use the below "Fixes #<issue number>" notation below
+-->
 
 Fixes #