From dd2568631a8e4523981c898a930a0119d338ccd9 Mon Sep 17 00:00:00 2001
From: Tim Vaillancourt <timvaillancourt@github.com>
Date: Thu, 17 Dec 2020 17:26:51 +0100
Subject: [PATCH 1/2] Use golang:1.15.x, remove jessie tarball build

---
 .github/workflows/ci.yml    | 4 ++--
 Dockerfile.packaging        | 2 +-
 Dockerfile.test             | 2 +-
 script/build-deploy-tarball | 2 --
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3556e1e..cf518ee 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,10 +10,10 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Set up Go 1.14
+    - name: Set up Go 1.15
       uses: actions/setup-go@v1
       with:
-        go-version: 1.14
+        go-version: 1.15
 
     - name: Build
       run: script/cibuild
diff --git a/Dockerfile.packaging b/Dockerfile.packaging
index 9c5cd29..092fade 100644
--- a/Dockerfile.packaging
+++ b/Dockerfile.packaging
@@ -1,6 +1,6 @@
 #
 
-FROM golang:1.14.7
+FROM golang:1.15.6
 
 RUN apt-get update
 RUN apt-get install -y ruby ruby-dev rubygems build-essential
diff --git a/Dockerfile.test b/Dockerfile.test
index 8f56be3..ceb46bf 100644
--- a/Dockerfile.test
+++ b/Dockerfile.test
@@ -1,4 +1,4 @@
-FROM golang:1.14.7
+FROM golang:1.15.6
 LABEL maintainer="github@github.com"
 
 RUN apt-get update
diff --git a/script/build-deploy-tarball b/script/build-deploy-tarball
index 95da838..ebd7c64 100755
--- a/script/build-deploy-tarball
+++ b/script/build-deploy-tarball
@@ -32,6 +32,4 @@ cp ${tarball}.gz "$BUILD_ARTIFACT_DIR"/gh-ost/
 # blame @carlosmn, @mattr and @timvaillancourt-
 # Allow builds on buster to also be used for stretch + jessie
 stretch_tarball_name=$(echo $(basename "${tarball}") | sed s/-buster-/-stretch-/)
-jessie_tarball_name=$(echo $(basename "${stretch_tarball_name}") | sed s/-stretch-/-jessie-/)
 cp ${tarball}.gz "$BUILD_ARTIFACT_DIR/gh-ost/${stretch_tarball_name}.gz"
-cp ${tarball}.gz "$BUILD_ARTIFACT_DIR/gh-ost/${jessie_tarball_name}.gz"

From 60294109ca895f0fcc4b98dec2cd4e32304a5a49 Mon Sep 17 00:00:00 2001
From: Tim Vaillancourt <timvaillancourt@github.com>
Date: Thu, 17 Dec 2020 23:17:34 +0100
Subject: [PATCH 2/2] Update comment

---
 script/build-deploy-tarball | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/build-deploy-tarball b/script/build-deploy-tarball
index ebd7c64..dc28b43 100755
--- a/script/build-deploy-tarball
+++ b/script/build-deploy-tarball
@@ -30,6 +30,6 @@ cp ${tarball}.gz "$BUILD_ARTIFACT_DIR"/gh-ost/
 
 ### HACK HACK HACK HACK ###
 # blame @carlosmn, @mattr and @timvaillancourt-
-# Allow builds on buster to also be used for stretch + jessie
+# Allow builds on buster to also be used for stretch
 stretch_tarball_name=$(echo $(basename "${tarball}") | sed s/-buster-/-stretch-/)
 cp ${tarball}.gz "$BUILD_ARTIFACT_DIR/gh-ost/${stretch_tarball_name}.gz"