From b26f3082e6386c1dd93c4670631a184814f9d61e Mon Sep 17 00:00:00 2001
From: Adam Chalmers <achalmers@cloudflare.com>
Date: Wed, 16 Sep 2020 12:45:09 -0500
Subject: [PATCH] Use Go 1.15.2

---
 cfsetup.yaml | 10 +++++-----
 go.mod       |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cfsetup.yaml b/cfsetup.yaml
index 7b4c46ab..de0e4af6 100644
--- a/cfsetup.yaml
+++ b/cfsetup.yaml
@@ -1,4 +1,4 @@
-pinned_go: &pinned_go go=1.14.7-1
+pinned_go: &pinned_go go=1.15.2-1
 build_dir: &build_dir /cfsetup_build
 default-flavor: stretch
 stretch: &stretch
@@ -220,8 +220,8 @@ centos-7:
       - https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
     post-cache:
       - sudo yum install -y fakeroot
-      - wget https://golang.org/dl/go1.14.7.linux-amd64.tar.gz -P /tmp/
-      - sudo tar -C /usr/local -xzf /tmp/go1.14.7.linux-amd64.tar.gz
+      - wget https://golang.org/dl/go1.15.2.linux-amd64.tar.gz -P /tmp/
+      - sudo tar -C /usr/local -xzf /tmp/go1.15.2.linux-amd64.tar.gz
       - export PATH=$PATH:/usr/local/go/bin
       - export GOOS=linux
       - export GOARCH=amd64
@@ -231,8 +231,8 @@ centos-7:
     builddeps: *el7_builddeps
     post-cache:
       - sudo yum install -y fakeroot
-      - wget https://golang.org/dl/go1.14.7.linux-amd64.tar.gz -P /tmp/
-      - sudo tar -C /usr/local -xzf /tmp/go1.14.7.linux-amd64.tar.gz
+      - wget https://golang.org/dl/go1.15.2.linux-amd64.tar.gz -P /tmp/
+      - sudo tar -C /usr/local -xzf /tmp/go1.15.2.linux-amd64.tar.gz
       - export PATH=$PATH:/usr/local/go/bin
       - export GOOS=linux
       - export GOARCH=amd64
diff --git a/go.mod b/go.mod
index a27c24f5..df2ea7d9 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/cloudflare/cloudflared
 
-go 1.14
+go 1.15
 
 require (
 	github.com/DATA-DOG/go-sqlmock v1.3.3