From 1a8c372947bd441ab95bf6a4b2ea5b1922475eb4 Mon Sep 17 00:00:00 2001
From: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com>
Date: Sun, 28 Jun 2020 08:39:16 +0300
Subject: [PATCH 1/6] Using golang 1.14

---
 .github/workflows/ci.yml            | 7 +++----
 .github/workflows/replica-tests.yml | 7 +++----
 Dockerfile.packaging                | 2 +-
 Dockerfile.test                     | 2 +-
 build.sh                            | 4 ++--
 script/ensure-go-installed          | 4 ++--
 6 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ec8978d..ded3c8b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,13 +8,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@master
+    - uses: actions/checkout@v2
 
-    - name: Set up Go 1.12
+    - name: Set up Go 1.14
       uses: actions/setup-go@v1
       with:
-        version: 1.12
-      id: go
+        go-version: 1.14
 
     - name: Build
       run: script/cibuild
diff --git a/.github/workflows/replica-tests.yml b/.github/workflows/replica-tests.yml
index d775131..31e2052 100644
--- a/.github/workflows/replica-tests.yml
+++ b/.github/workflows/replica-tests.yml
@@ -8,13 +8,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@master
+    - uses: actions/checkout@v2
 
-    - name: Set up Go 1.12
+    - name: Set up Go 1.14
       uses: actions/setup-go@v1
       with:
-        version: 1.12
-      id: go
+        go-version: 1.14
 
     - name: migration tests
       run:  script/cibuild-gh-ost-replica-tests
diff --git a/Dockerfile.packaging b/Dockerfile.packaging
index 214c70c..74aa190 100644
--- a/Dockerfile.packaging
+++ b/Dockerfile.packaging
@@ -1,6 +1,6 @@
 #
 
-FROM golang:1.12.6
+FROM golang:1.14.4
 
 RUN apt-get update
 RUN apt-get install -y ruby ruby-dev rubygems build-essential
diff --git a/Dockerfile.test b/Dockerfile.test
index 6abc4a0..3b3bfe5 100644
--- a/Dockerfile.test
+++ b/Dockerfile.test
@@ -1,4 +1,4 @@
-FROM golang:1.12.1
+FROM golang:1.14.4
 LABEL maintainer="github@github.com"
 
 RUN apt-get update
diff --git a/build.sh b/build.sh
index 46db9c2..98633cd 100755
--- a/build.sh
+++ b/build.sh
@@ -18,8 +18,8 @@ function build {
   GOOS=$3
   GOARCH=$4
 
-  if ! go version | egrep -q 'go(1\.1[234])' ; then
-    echo "go version must be 1.12 or above"
+  if ! go version | egrep -q 'go(1\.1[23456])' ; then
+    echo "go version must be 1.14 or above"
     exit 1
   fi
 
diff --git a/script/ensure-go-installed b/script/ensure-go-installed
index c9c2ae8..1abdeb3 100755
--- a/script/ensure-go-installed
+++ b/script/ensure-go-installed
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-PREFERRED_GO_VERSION=go1.12.6
-SUPPORTED_GO_VERSIONS='go1.1[234]'
+PREFERRED_GO_VERSION=go1.14
+SUPPORTED_GO_VERSIONS='go1.1[23456]'
 
 GO_PKG_DARWIN=${PREFERRED_GO_VERSION}.darwin-amd64.pkg
 GO_PKG_DARWIN_SHA=ea78245e43de2996fa0973033064b33f48820cfe39f4f3c6e953040925cc5815

From fb4aca156751db491d8a83096367c379cdebcc64 Mon Sep 17 00:00:00 2001
From: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com>
Date: Sun, 28 Jun 2020 08:49:30 +0300
Subject: [PATCH 2/6] checksums

---
 script/ensure-go-installed | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/script/ensure-go-installed b/script/ensure-go-installed
index 1abdeb3..32ade46 100755
--- a/script/ensure-go-installed
+++ b/script/ensure-go-installed
@@ -1,13 +1,13 @@
 #!/bin/bash
 
-PREFERRED_GO_VERSION=go1.14
+PREFERRED_GO_VERSION=go1.14.4
 SUPPORTED_GO_VERSIONS='go1.1[23456]'
 
 GO_PKG_DARWIN=${PREFERRED_GO_VERSION}.darwin-amd64.pkg
-GO_PKG_DARWIN_SHA=ea78245e43de2996fa0973033064b33f48820cfe39f4f3c6e953040925cc5815
+GO_PKG_DARWIN_SHA=b518f21f823759ee30faddb1f623810a432499f050c9338777523d9c8551c62c
 
 GO_PKG_LINUX=${PREFERRED_GO_VERSION}.linux-amd64.tar.gz
-GO_PKG_LINUX_SHA=dbcf71a3c1ea53b8d54ef1b48c85a39a6c9a935d01fc8291ff2b92028e59913c
+GO_PKG_LINUX_SHA=aed845e4185a0b2a3c3d5e1d0a35491702c55889192bb9c30e67a3de6849c067
 
 export ROOTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
 cd $ROOTDIR

From 2b71b73285338e96798d2530c8adec9aeb28910f Mon Sep 17 00:00:00 2001
From: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com>
Date: Sun, 28 Jun 2020 08:57:19 +0300
Subject: [PATCH 3/6] Actions/workflows: upload binary artifact

---
 .github/workflows/ci.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ded3c8b..3556e1e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,3 +17,9 @@ jobs:
 
     - name: Build
       run: script/cibuild
+
+    - name: Upload gh-ost binary artifact
+      uses: actions/upload-artifact@v1
+      with:
+        name: gh-ost
+        path: bin/gh-ost

From 8eb300bdc8bb183e79e4f50f40288e114aa5c55a Mon Sep 17 00:00:00 2001
From: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com>
Date: Mon, 29 Jun 2020 09:52:47 +0300
Subject: [PATCH 4/6] expect 1.14 and above in build scripts; update to
 readme.md

---
 README.md                  | 2 +-
 build.sh                   | 2 +-
 script/ensure-go-installed | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index cd6f592..7b2bc1d 100644
--- a/README.md
+++ b/README.md
@@ -94,7 +94,7 @@ Please see [Coding gh-ost](doc/coding-ghost.md) for a guide to getting started d
 
 [Download latest release here](https://github.com/github/gh-ost/releases/latest)
 
-`gh-ost` is a Go project; it is built with Go `1.12` and above. To build on your own, use either:
+`gh-ost` is a Go project; it is built with Go `1.14` and above. To build on your own, use either:
 - [script/build](https://github.com/github/gh-ost/blob/master/script/build) - this is the same build script used by CI hence the authoritative; artifact is `./bin/gh-ost` binary.
 - [build.sh](https://github.com/github/gh-ost/blob/master/build.sh) for building `tar.gz` artifacts in `/tmp/gh-ost`
 
diff --git a/build.sh b/build.sh
index 98633cd..b5d4659 100755
--- a/build.sh
+++ b/build.sh
@@ -18,7 +18,7 @@ function build {
   GOOS=$3
   GOARCH=$4
 
-  if ! go version | egrep -q 'go(1\.1[23456])' ; then
+  if ! go version | egrep -q 'go(1\.1[456])' ; then
     echo "go version must be 1.14 or above"
     exit 1
   fi
diff --git a/script/ensure-go-installed b/script/ensure-go-installed
index 32ade46..98ccdc1 100755
--- a/script/ensure-go-installed
+++ b/script/ensure-go-installed
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 PREFERRED_GO_VERSION=go1.14.4
-SUPPORTED_GO_VERSIONS='go1.1[23456]'
+SUPPORTED_GO_VERSIONS='go1.1[456]'
 
 GO_PKG_DARWIN=${PREFERRED_GO_VERSION}.darwin-amd64.pkg
 GO_PKG_DARWIN_SHA=b518f21f823759ee30faddb1f623810a432499f050c9338777523d9c8551c62c

From 25d28855b27bb4519d6951eb236118b1c0e44a15 Mon Sep 17 00:00:00 2001
From: Tim Vaillancourt <timvaillancourt@github.com>
Date: Wed, 19 Aug 2020 20:21:40 +0200
Subject: [PATCH 5/6] Copy of PR https://github.com/github/gh-ost/pull/861

---
 Dockerfile.packaging | 2 +-
 Dockerfile.test      | 2 +-
 README.md            | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Dockerfile.packaging b/Dockerfile.packaging
index 74aa190..9c5cd29 100644
--- a/Dockerfile.packaging
+++ b/Dockerfile.packaging
@@ -1,6 +1,6 @@
 #
 
-FROM golang:1.14.4
+FROM golang:1.14.7
 
 RUN apt-get update
 RUN apt-get install -y ruby ruby-dev rubygems build-essential
diff --git a/Dockerfile.test b/Dockerfile.test
index 3b3bfe5..8f56be3 100644
--- a/Dockerfile.test
+++ b/Dockerfile.test
@@ -1,4 +1,4 @@
-FROM golang:1.14.4
+FROM golang:1.14.7
 LABEL maintainer="github@github.com"
 
 RUN apt-get update
diff --git a/README.md b/README.md
index 7b2bc1d..d4a17e9 100644
--- a/README.md
+++ b/README.md
@@ -109,3 +109,4 @@ Generally speaking, `master` branch is stable, but only [releases](https://githu
 - [@shlomi-noach](https://github.com/shlomi-noach)
 - [@jessbreckenridge](https://github.com/jessbreckenridge)
 - [@gtowey](https://github.com/gtowey)
+- [@timvaillancourt](https://github.com/timvaillancourt)

From 42bd9187c1cf93b37438ea6dae9ca0a93d14c863 Mon Sep 17 00:00:00 2001
From: Tim Vaillancourt <timvaillancourt@github.com>
Date: Wed, 19 Aug 2020 20:27:11 +0200
Subject: [PATCH 6/6] Use 1.14.7

---
 script/ensure-go-installed | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/script/ensure-go-installed b/script/ensure-go-installed
index 98ccdc1..baa5bd7 100755
--- a/script/ensure-go-installed
+++ b/script/ensure-go-installed
@@ -1,13 +1,13 @@
 #!/bin/bash
 
-PREFERRED_GO_VERSION=go1.14.4
+PREFERRED_GO_VERSION=go1.14.7
 SUPPORTED_GO_VERSIONS='go1.1[456]'
 
 GO_PKG_DARWIN=${PREFERRED_GO_VERSION}.darwin-amd64.pkg
-GO_PKG_DARWIN_SHA=b518f21f823759ee30faddb1f623810a432499f050c9338777523d9c8551c62c
+GO_PKG_DARWIN_SHA=0f215de06019a054a3da46a0722989986c956d719c7a0a8fc38a5f3c216d6f6b
 
 GO_PKG_LINUX=${PREFERRED_GO_VERSION}.linux-amd64.tar.gz
-GO_PKG_LINUX_SHA=aed845e4185a0b2a3c3d5e1d0a35491702c55889192bb9c30e67a3de6849c067
+GO_PKG_LINUX_SHA=4a7fa60f323ee1416a4b1425aefc37ea359e9d64df19c326a58953a97ad41ea5
 
 export ROOTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
 cd $ROOTDIR